Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tor
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ed87738e

Commit ed87738e authored 14 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

Conflicts:
	src/or/config.c
	src/or/networkstatus.c
	src/or/rendcommon.c
	src/or/routerparse.c
	src/or/test.c

parents b27f5cc5 50b06a2b

Branches

Tags

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

changes/bug2332 4 additions, 0 deletions

changes/bug2332
changes/tolen_asserts 8 additions, 0 deletions

changes/tolen_asserts
src/common/crypto.c 42 additions, 11 deletions

src/common/crypto.c
src/common/crypto.h 7 additions, 5 deletions

src/common/crypto.h
src/or/config.c 2 additions, 2 deletions

src/or/config.c
src/or/dnsserv.c 1 addition, 1 deletion

src/or/dnsserv.c
src/or/networkstatus.c 1 addition, 0 deletions

src/or/networkstatus.c
src/or/onion.c 2 additions, 0 deletions

src/or/onion.c
src/or/rendclient.c 1 addition, 0 deletions

src/or/rendclient.c
src/or/rendservice.c 4 additions, 2 deletions

src/or/rendservice.c
src/or/routerlist.c 2 additions, 1 deletion

src/or/routerlist.c
src/or/routerparse.c 11 additions, 7 deletions

src/or/routerparse.c
src/test/test_crypto.c 19 additions, 13 deletions

src/test/test_crypto.c

with 104 additions and 42 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment