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

bf89b089

Commit bf89b089 authored 7 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge branch 'bug24367_032_squashed' into maint-0.3.2

parents cf5ab593 19a4abf2

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

changes/bug24367 13 additions, 0 deletions

changes/bug24367
src/or/bridges.c 7 additions, 31 deletions

src/or/bridges.c
src/or/bridges.h 0 additions, 1 deletion

src/or/bridges.h
src/or/circuituse.c 12 additions, 3 deletions

src/or/circuituse.c
src/or/directory.c 5 additions, 4 deletions

src/or/directory.c
src/or/entrynodes.c 20 additions, 6 deletions

src/or/entrynodes.c
src/or/entrynodes.h 1 addition, 2 deletions

src/or/entrynodes.h
src/or/networkstatus.c 3 additions, 1 deletion

src/or/networkstatus.c
src/test/test_dir.c 12 additions, 10 deletions

src/test/test_dir.c

with 73 additions and 58 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