diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-01 11:51:22 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-01 11:51:22 -0400 |
| commit | 1bbd3811c1c98e6a630ab96f15a376910a576626 (patch) | |
| tree | f54b5c97109877aca1264e117a71b1f056f8d853 /src/or/entrynodes.c | |
| parent | 9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2 (diff) | |
| parent | ce450bddb7b66e73e34eec3844623884cbbcc27c (diff) | |
| download | tor-1bbd3811c1c98e6a630ab96f15a376910a576626.tar.gz tor-1bbd3811c1c98e6a630ab96f15a376910a576626.zip | |
Merge remote-tracking branch 'public/bug10849_025'
Conflicts:
src/or/config.c
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 70587bd758..957217ac6c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -378,7 +378,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); |