aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug23795
-rw-r--r--doc/HACKING5
-rw-r--r--doc/tor.1.txt16
-rw-r--r--src/or/main.c2
4 files changed, 27 insertions, 1 deletions
diff --git a/changes/bug2379 b/changes/bug2379
new file mode 100644
index 000000000..0d378b7c1
--- /dev/null
+++ b/changes/bug2379
@@ -0,0 +1,5 @@
+ o Documentation:
+ - Add missing documentation for the authority-related torrc options
+ RephistTrackTime, BridgePassword, and V3AuthUseLegacyKey. Resolves
+ issue 2379.
+
diff --git a/doc/HACKING b/doc/HACKING
index 86d4a9878..e00aeb1aa 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -474,7 +474,10 @@ in their approved versions list.
and push the git tag.
(That's either "git tag -u <keyid> tor-0.2.x.y-status", then
"git push origin tag tor-0.2.x.y-status". To sign the
- tarball, "gpg -ba <the_tarball>")
+ tarball, "gpg -ba <the_tarball>". Put the files in
+ /src/www-master.torproject.org/htdocs/dist on vescum, then
+ sudo -u mirroradm -H /home/mirroradm/bin/trigger-mirrors sudoed
+ )
8) Edit include/versions.wmi to note the new version. Rebuild and push
the website.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 04a053771..030f1cf32 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1253,6 +1253,11 @@ DIRECTORY AUTHORITY SERVER OPTIONS
Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies
to addresses shared with directory authorities. (Default: 5)
+**BridgePassword** __Password__::
+ If set, contains an HTTP authenticator that tells a bridge authority to
+ serve all requested bridge information. Used for debugging. (Default:
+ not set.)
+
**V3AuthVotingInterval** __N__ **minutes**|**hours**::
V3 authoritative directories only. Configures the server's preferred voting
interval. Note that voting will __actually__ happen at an interval chosen
@@ -1285,6 +1290,17 @@ DIRECTORY AUTHORITY SERVER OPTIONS
bandiwdth-authority generated file storing information on relays' measured
bandwidth capacities. (Default: unset.)
+**V3AuthUseLegacyKey** **0**|**1**::
+ If set, the directory authority will sign consensuses not only with its
+ own signing key, but also with a "legacy" key and certificate with a
+ different identity. This feature is used to migrate directory authority
+ keys in the event of a compromise. (Default: 0.)
+
+**RephistTrackTime** __N__ **seconds**|**minutes**|**hours**|**days**|**weeks**::
+ Tells an authority, or other node tracking node reliability and history,
+ that fine-grained information about nodes can be discarded when it hasn't
+ changed for a given amount of time. (Default: 24 hours)
+
HIDDEN SERVICE OPTIONS
----------------------
diff --git a/src/or/main.c b/src/or/main.c
index 462b51e78..7bae59ce0 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1587,6 +1587,7 @@ do_main_loop(void)
}
}
+#ifndef MS_WINDOWS /* Only called when we're willing to use signals */
/** Libevent callback: invoked when we get a signal.
*/
static void
@@ -1598,6 +1599,7 @@ signal_callback(int fd, short events, void *arg)
process_signal(sig);
}
+#endif
/** Do the work of acting on a signal received in <b>sig</b> */
void