Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

Tor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

caf28519

Commit caf28519 authored 10 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge branch 'bug12844'

Conflicts:
	src/or/circuituse.c
	src/test/include.am
	src/test/test_entrynodes.c

parents 0c81dfa8 0899f51b

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

changes/feature12844 5 additions, 0 deletions

changes/feature12844
doc/tor.1.txt 16 additions, 0 deletions

doc/tor.1.txt
src/or/circuitbuild.c 84 additions, 3 deletions

src/or/circuitbuild.c
src/or/circuitbuild.h 3 additions, 0 deletions

src/or/circuitbuild.h
src/or/circuituse.c 11 additions, 1 deletion

src/or/circuituse.c
src/or/config.c 11 additions, 2 deletions

src/or/config.c
src/or/or.h 3 additions, 0 deletions

src/or/or.h
src/or/routerlist.c 1 addition, 1 deletion

src/or/routerlist.c
src/or/routerlist.h 4 additions, 0 deletions

src/or/routerlist.h
src/test/include.am 4 additions, 1 deletion

src/test/include.am
src/test/test_entrynodes.c 6 additions, 62 deletions

src/test/test_entrynodes.c
src/test/test_hs.c 80 additions, 0 deletions

src/test/test_hs.c
src/test/testhelper.c 67 additions, 0 deletions

src/test/testhelper.c
src/test/testhelper.h 10 additions, 0 deletions

src/test/testhelper.h

with 305 additions and 70 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