diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-17 10:48:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-17 10:48:12 -0400 |
| commit | 548d14247e3c8a48e2efb2ca62ee7a05fca843ba (patch) | |
| tree | 461e46b28ff628235379dfa242fa44b1ca1eccfa /src/or/dirserv.c | |
| parent | 6cc3397e26ff37d6f01471b83e0e5bb1b5aa8eee (diff) | |
| parent | 06031b441eb92f575f0a1c2ac264dc0daee4fbf4 (diff) | |
| download | tor-548d14247e3c8a48e2efb2ca62ee7a05fca843ba.tar.gz tor-548d14247e3c8a48e2efb2ca62ee7a05fca843ba.zip | |
Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 3e1f48062c..d38a024e14 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1131,8 +1131,11 @@ directory_caches_unknown_auth_certs(const or_options_t *options) return dir_server_mode(options) || options->BridgeRelay; } -/** Return 1 if we want to keep descriptors, networkstatuses, etc around - * and we're willing to serve them to others. Else return 0. +/** Return 1 if we want to keep descriptors, networkstatuses, etc around. + * Else return 0. + * Check options->DirPort_set and directory_permits_begindir_requests() + * to see if we are willing to serve these directory documents to others via + * the DirPort and begindir-over-ORPort, respectively. */ int directory_caches_dir_info(const or_options_t *options) |