Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tor
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Incidents
- Service Desk

Snippets Groups Projects

5d4bb6f6

Commit 5d4bb6f6 authored 10 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote-tracking branch 'public/ticket9969'

Conflicts:
	src/or/directory.c
	src/or/routerlist.c
	src/or/routerlist.h
	src/test/include.am
	src/test/test.c

parents bd22ad12 ac9b0a31

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/or/directory.c 57 additions, 47 deletions

src/or/directory.c
src/or/directory.h 8 additions, 3 deletions

src/or/directory.h
src/or/or.h 5 additions, 6 deletions

src/or/or.h
src/or/routerlist.c 172 additions, 116 deletions

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

src/or/routerlist.h
src/test/include.am 11 additions, 10 deletions

src/test/include.am
src/test/test.c 50 additions, 48 deletions

src/test/test.c
src/test/test_dir.c 26 additions, 0 deletions

src/test/test_dir.c
src/test/test_nodelist.c 1 addition, 1 deletion

src/test/test_nodelist.c
src/test/test_routerlist.c 103 additions, 0 deletions

src/test/test_routerlist.c

with 437 additions and 231 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