summaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-17 11:10:20 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-17 11:10:20 -0400
commit6382cd93cb99d1f5cff62bfe7759eca8a6948782 (patch)
treedb86f11cd30f2fa8314fc60bfd464ebcc3940dca /src/or/dirserv.c
parent49c83dd21a7fe0432ad78061f3b41f4a5919340d (diff)
parentd6a2fec05ebcc39773a2f6666e1378410c64f047 (diff)
downloadtor-6382cd93cb99d1f5cff62bfe7759eca8a6948782.tar.gz
tor-6382cd93cb99d1f5cff62bfe7759eca8a6948782.zip
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 441e4b5377..8b5da09e91 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)