diff options
| author | Roger Dingledine <arma@torproject.org> | 2016-10-02 01:12:27 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2016-10-02 01:12:27 -0400 |
| commit | 782b6ec288a553f66e47157d377ec4b200b54394 (patch) | |
| tree | 12d3b8dece76af042ba209dfcda85df7ca49513c /src/or/microdesc.c | |
| parent | bfaded9143d127cb32407a7a58159383fa9ed333 (diff) | |
| download | tor-782b6ec288a553f66e47157d377ec4b200b54394.tar.gz tor-782b6ec288a553f66e47157d377ec4b200b54394.zip | |
Bridges and relays now use microdescriptors
(like clients do) rather than old-style router descriptors. Now bridges
will blend in with clients in terms of the circuits they build.
Fixes bug 6769; bugfix on 0.2.3.2-alpha.
Diffstat (limited to 'src/or/microdesc.c')
| -rw-r--r-- | src/or/microdesc.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 57efc725a0..ccb28a914d 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -919,12 +919,8 @@ we_use_microdescriptors_for_circuits(const or_options_t *options) { int ret = options->UseMicrodescriptors; if (ret == -1) { - /* UseMicrodescriptors is "auto"; we need to decide: */ - /* We'll use microdescriptors iff we are - * not a server, and we're not autofetching everything. */ - /* XXXX++ what does not being a server have to do with it? also there's - * a partitioning issue here where bridges differ from clients. */ - ret = !server_mode(options) && !options->FetchUselessDescriptors; + /* UseMicrodescriptors is "auto"; choose yes. */ + return 1; } return ret; } |