diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 14:50:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 14:50:01 -0400 |
| commit | 26639b7798b5f5dae93e40bd7d050cb218a8aad2 (patch) | |
| tree | 4e267e2dee87d5e3ffe6c1f4c94dd882961269e3 /src/or/circuitbuild.c | |
| parent | 173efa10515e23b45e37f96a3755a2f16411a71a (diff) | |
| parent | 44095312fa63c2623418346eb0cb487b45cf9c50 (diff) | |
| download | tor-26639b7798b5f5dae93e40bd7d050cb218a8aad2.tar.gz tor-26639b7798b5f5dae93e40bd7d050cb218a8aad2.zip | |
Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index fbe94a98ba..bb5b253c83 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -3398,6 +3398,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) }); } /* and exclude current entry guards and their families, if applicable */ + /*XXXX025 use the using_as_guard flag to accomplish this.*/ if (options->UseEntryGuards) { SMARTLIST_FOREACH(get_entry_guards(), const entry_guard_t *, entry, { |