diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-01-25 20:18:51 -0500 |
|---|---|---|
| committer | Andrea Shepard <andrea@torproject.org> | 2013-02-02 08:04:20 -0800 |
| commit | a8297cdbd3324ac707165ae9922ecf478c4608a1 (patch) | |
| tree | 921123e6fd3e8b2838c9256579c52f49ec084805 /src/or/circuitbuild.c | |
| parent | acb43c0735af8a7cd9e8eb57bb8835b11a90a1be (diff) | |
| download | tor-a8297cdbd3324ac707165ae9922ecf478c4608a1.tar.gz tor-a8297cdbd3324ac707165ae9922ecf478c4608a1.zip | |
use microdescriptors if *any* of our bridges can handle them
Now as we move into a future where most bridges can handle microdescs
we will generally find ourselves using them, rather than holding back
just because one of our bridges doesn't use them.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5a5a3afea7..8c86aac90c 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -25,6 +25,7 @@ #include "directory.h" #include "entrynodes.h" #include "main.h" +#include "microdesc.h" #include "networkstatus.h" #include "nodelist.h" #include "onion.h" @@ -3372,7 +3373,7 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) (purpose != CIRCUIT_PURPOSE_TESTING || options->BridgeRelay)) { /* This request is for an entry server to use for a regular circuit, * and we use entry guard nodes. Just return one of the guard nodes. */ - return choose_random_entry(state); + return choose_random_entry(state, 0); } excluded = smartlist_new(); |