diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-10-19 17:11:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-10-19 17:11:47 -0400 |
| commit | 12cf73c4516132a85f76d1c6e60c9492e8751987 (patch) | |
| tree | 11254e166ba6134597416fa2a8d91c3178212853 /src/or/circuitbuild.c | |
| parent | ec4142abdf7fa4efaa281413e31acc93bf22ea4a (diff) | |
| parent | 1c6f8841f47d5d55e73d18a9414fc68377a13c0e (diff) | |
| download | tor-12cf73c4516132a85f76d1c6e60c9492e8751987.tar.gz tor-12cf73c4516132a85f76d1c6e60c9492e8751987.zip | |
Merge remote-tracking branch 'andrea/ticket19858_v2'
Conflict in entrynodes.c: any_bridge_supports_microdescriptors was
removed in master, and modified in 19858_v2
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cc9b184698..873d2ec4a3 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2235,7 +2235,6 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) * This is an incomplete fix, but is no worse than the previous behaviour, * and only applies to minimal, testing tor networks * (so it's no less secure) */ - /*XXXX++ use the using_as_guard flag to accomplish this.*/ if (options->UseEntryGuards && (!options->TestingTorNetwork || smartlist_len(nodelist_get_list()) > smartlist_len(get_entry_guards()) |