- tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix compile warning on windows
by nickm＠torproject.org 05 May '11

05 May '11

commit 9a490bb53b98efa4cec721a80fe5fec94c554c1f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 5 02:21:09 2011 +0200 Fix compile warning on windows --- src/or/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 462b51e..7bae59c 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

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2
by nickm＠torproject.org 05 May '11

05 May '11

commit ab1460f3ae00f6caab9feead455eebfb0d03d5e4 Merge: 0ee524b 9a490bb Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 20:33:16 2011 -0400 Merge remote-tracking branch 'sebastian/win_warning' into maint-0.2.2 src/or/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)

1 0

[tor/master] Add some missing torrc entries to tor.1.txt
by nickm＠torproject.org 05 May '11

05 May '11

commit b04dca448da474ceb3f9a5f1ead2efffa42c6aa6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 22:14:40 2011 -0400 Add some missing torrc entries to tor.1.txt Fixes bug 2379 --- changes/bug2379 | 5 +++++ doc/tor.1.txt | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/changes/bug2379 b/changes/bug2379 new file mode 100644 index 0000000..0d378b7 --- /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/tor.1.txt b/doc/tor.1.txt index 04a0537..030f1cf 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 ----------------------

1 0

[tor/master] Merge branch 'bug2379' into maint-0.2.2
by nickm＠torproject.org 05 May '11

05 May '11

commit 0ee524b57f35460229725c7a43f28ab73bfaa3fa Merge: 29f1ffa b04dca4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 17:37:56 2011 -0400 Merge branch 'bug2379' into maint-0.2.2 changes/bug2379 | 5 +++++ doc/tor.1.txt | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 05 May '11

05 May '11

commit 4c9bd06d0d3d0ce8150c065a51fd432c6e689b0c Merge: 699af20 0ee524b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 17:38:33 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2379 | 5 +++++ doc/tor.1.txt | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] Merge branch 'bug2379' into maint-0.2.2
by nickm＠torproject.org 05 May '11

05 May '11

commit 0ee524b57f35460229725c7a43f28ab73bfaa3fa Merge: 29f1ffa b04dca4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 17:37:56 2011 -0400 Merge branch 'bug2379' into maint-0.2.2 changes/bug2379 | 5 +++++ doc/tor.1.txt | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.2] Add some missing torrc entries to tor.1.txt
by nickm＠torproject.org 05 May '11

05 May '11

commit b04dca448da474ceb3f9a5f1ead2efffa42c6aa6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 22:14:40 2011 -0400 Add some missing torrc entries to tor.1.txt Fixes bug 2379 --- changes/bug2379 | 5 +++++ doc/tor.1.txt | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-) diff --git a/changes/bug2379 b/changes/bug2379 new file mode 100644 index 0000000..0d378b7 --- /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/tor.1.txt b/doc/tor.1.txt index 04a0537..030f1cf 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 ----------------------

1 0

[tor/master] More notes on how to upload tarballs from erinn
by nickm＠torproject.org 05 May '11

05 May '11

commit 29f1ffa0fec58f4588e163006f561e8912a2c942 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 17:21:33 2011 -0400 More notes on how to upload tarballs from erinn --- doc/HACKING | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 86d4a98..e00aeb1 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.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 05 May '11

05 May '11

commit 699af20e9ad7c9349971c1e6a37bafe908c86b5f Merge: fac99f0 29f1ffa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 17:21:44 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] More notes on how to upload tarballs from erinn
by nickm＠torproject.org 05 May '11

05 May '11

commit 29f1ffa0fec58f4588e163006f561e8912a2c942 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 17:21:33 2011 -0400 More notes on how to upload tarballs from erinn --- doc/HACKING | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 86d4a98..e00aeb1 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.

1 0