summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-10 09:03:11 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-10 09:03:11 -0500
commit26e7e519dc72aba1f00b9f0179f58e10fafda3d2 (patch)
tree0b06d4cfddf8a54d24b008a85055cb0aa4c3bf0b
parent7f7df97579ba1035594c1d7589b890360ee93033 (diff)
downloadtor-26e7e519dc72aba1f00b9f0179f58e10fafda3d2.tar.gz
tor-26e7e519dc72aba1f00b9f0179f58e10fafda3d2.zip
Document networkstatus-bridges
Closes 13713; patch from 'tom'
-rw-r--r--changes/bug137133
-rw-r--r--doc/tor.1.txt5
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/bug13713 b/changes/bug13713
new file mode 100644
index 0000000000..412b406c53
--- /dev/null
+++ b/changes/bug13713
@@ -0,0 +1,3 @@
+ o Documentation:
+ - Document the bridge-authority-only 'networkstatus-bridges'
+ file. Closes ticket 13713; patch from "tom".
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 58107130a6..eb406e7cb7 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2409,6 +2409,11 @@ __DataDirectory__**/stats/conn-stats**::
Only used by servers. This file is used to collect approximate connection
history (number of active connections over time).
+__DataDirectory__**/networkstatus-bridges**::
+ Only used by authoritative bridge directories. Contains information
+ about bridges that have self-reported themselves to the bridge
+ authority.
+
__HiddenServiceDirectory__**/hostname**::
The <base32-encoded-fingerprint>.onion domain name for this hidden service.
If the hidden service is restricted to authorized clients only, this file