commit 456184c2a005d282df4bb1c92e0f3d80b52e99cb Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 20 09:02:24 2014 -0400

Authorities also advertise caches-extra-info

(Whoops, thought I had committed this before)

Improvement to 11683 fix. Based on patch from Karsten. --- changes/bug11683 | 4 +++- src/or/router.c | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/bug11683 b/changes/bug11683 index 52f623c..ccbd2a5 100644 --- a/changes/bug11683 +++ b/changes/bug11683 @@ -3,4 +3,6 @@ documents, regardless of whether their server descriptor contains a "caches-extra-info" line or not. Fixes part of #11683. Bugfix on 0.2.0.1-alpha. - + - When running as a v3 directory authority, advertise that you serve + extra-info documents so that clients who want them can find them from + you too. Fixes part of bug #11683. Bugfix on 0.2.0.1-alpha. diff --git a/src/or/router.c b/src/or/router.c index 2cdbb0c..4fcd4a5 100755 --- a/src/or/router.c +++ b/src/or/router.c @@ -2371,7 +2371,8 @@ router_dump_router_to_string(routerinfo_t *router, has_extra_info_digest ? "extra-info-digest " : "", has_extra_info_digest ? extra_info_digest : "", has_extra_info_digest ? "\n" : "", - options->DownloadExtraInfo ? "caches-extra-info\n" : "", + (options->DownloadExtraInfo || options->V3AuthoritativeDir) ? + "caches-extra-info\n" : "", onion_pkey, identity_pkey, family_line, we_are_hibernating() ? "hibernating 1\n" : "",