diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-11 11:10:55 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-11 11:10:55 -0500 |
| commit | ce450bddb7b66e73e34eec3844623884cbbcc27c (patch) | |
| tree | 0d32b297493f1c14ea479ca12513f414726f9af2 /src/or/entrynodes.c | |
| parent | cb065a55bd209b9c23bc14119c2403680b087885 (diff) | |
| download | tor-ce450bddb7b66e73e34eec3844623884cbbcc27c.tar tor-ce450bddb7b66e73e34eec3844623884cbbcc27c.tar.gz | |
Remove TunnelDirConns and PreferTunnelledDirConns
These options were added back in 0.1.2.5-alpha, but no longer make any
sense now that all directories support tunneled connections and
BEGIN_DIR cells. These options were on by default; now they are
always-on.
This is a fix for 10849, where TunnelDirConns 0 would break hidden
services -- and that bug arrived, I think, in 0.2.0.10-alpha.
Diffstat (limited to 'src/or/entrynodes.c')
| -rw-r--r-- | src/or/entrynodes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d463303fc..d626032ac 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -376,7 +376,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, } else { const routerstatus_t *rs; rs = router_pick_directory_server(MICRODESC_DIRINFO|V3_DIRINFO, - PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD); + PDS_FOR_GUARD); if (!rs) return NULL; node = node_get_by_id(rs->identity_digest); |