Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

12cf73c4

Commit 12cf73c4 authored 8 years ago by Nick Mathewson

Downloads
- Plain Diff

Merge remote-tracking branch 'andrea/ticket19858_v2'

Conflict in entrynodes.c: any_bridge_supports_microdescriptors was
removed in master, and modified in 19858_v2

parents ec4142ab 1c6f8841

No related branches found

No related tags found

No related merge requests found

Changes 8

Expand all Hide whitespace changes

Inline Side-by-side

Showing

changes/ticket19858 4 additions, 0 deletions

changes/ticket19858
src/or/circuitbuild.c 0 additions, 1 deletion

src/or/circuitbuild.c
src/or/entrynodes.c 443 additions, 167 deletions

src/or/entrynodes.c
src/or/entrynodes.h 28 additions, 3 deletions

src/or/entrynodes.h
src/or/or.h 0 additions, 3 deletions

src/or/or.h
src/or/routerlist.c 3 additions, 3 deletions

src/or/routerlist.c
src/test/test_entrynodes.c 12 additions, 6 deletions

src/test/test_entrynodes.c
src/test/test_routerlist.c 60 additions, 8 deletions

src/test/test_routerlist.c

with 550 additions and 191 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