diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-06-28 11:12:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-06-28 11:12:51 -0400 |
| commit | f87aa4555d06b2707e21df39d1bc7f14161a2cb4 (patch) | |
| tree | a990e92cc065c4817ce8bdad58cc0282e6cb9673 /src/or/routerlist.c | |
| parent | 0116eae59a35e4303ca179d6b0fb0302a83e87a1 (diff) | |
| parent | 608c12baaf820c33246052e23fd0c65459ed1c5c (diff) | |
| download | tor-f87aa4555d06b2707e21df39d1bc7f14161a2cb4.tar.gz tor-f87aa4555d06b2707e21df39d1bc7f14161a2cb4.zip | |
Merge remote-tracking branch 'teor/bug18812' into maint-0.2.8
Diffstat (limited to 'src/or/routerlist.c')
| -rw-r--r-- | src/or/routerlist.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 82376c073f..432c64d53d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1384,6 +1384,7 @@ router_get_trusteddirserver_by_digest(const char *digest) * key hashes to <b>digest</b>, or NULL if no such fallback is in the list of * fallback_dir_servers. (fallback_dir_servers is affected by the FallbackDir * and UseDefaultFallbackDirs torrc options.) + * The list of fallback directories includes the list of authorities. */ dir_server_t * router_get_fallback_dirserver_by_digest(const char *digest) @@ -1407,6 +1408,7 @@ router_get_fallback_dirserver_by_digest(const char *digest) * or 0 if no such fallback is in the list of fallback_dir_servers. * (fallback_dir_servers is affected by the FallbackDir and * UseDefaultFallbackDirs torrc options.) + * The list of fallback directories includes the list of authorities. */ int router_digest_is_fallback_dir(const char *digest) |