tor-commits May 2011

tor-commits@lists.torproject.org

15 participants
1011 discussions

[tor/release-0.2.2] fix the website directions.
by arma＠torproject.org 11 May '11

11 May '11

commit be7e8f5bb90acbf6717b9a14d21fdf4733c5d9e5 Author: Andrew Lewman <andrew(a)torproject.org> Date: Thu May 5 15:18:14 2011 -0400 fix the website directions. --- doc/HACKING | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index e00aeb1..feafb55 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -475,12 +475,10 @@ 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>". Put the files in - /src/www-master.torproject.org/htdocs/dist on vescum, then - sudo -u mirroradm -H /home/mirroradm/bin/trigger-mirrors sudoed - ) + /srv/www-master.torproject.org/htdocs/dist/ on vescum.) -8) Edit include/versions.wmi to note the new version. Rebuild and push -the website. +8) Edit include/versions.wmi to note the new version. From your website +checkout, run ./publish to build and publish the website. 9) Email Erinn and weasel (cc'ing tor-assistants) that a new tarball is up. This step should probably change to mailing more packagers.

1 0

[tor/release-0.2.2] Fix a docstring
by arma＠torproject.org 11 May '11

11 May '11

commit 532c13693e97565fe50a8a788d669d3ec94ad822 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 26 02:16:24 2011 +0200 Fix a docstring --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 9f7739a..28780d2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3875,7 +3875,7 @@ static int bootstrap_problems = 0; * information and initial circuits. * * status is the new status, that is, what task we will be doing - * next. percent is zero if we just started this task, else it + * next. progress is zero if we just started this task, else it * represents progress on the task. */ void control_event_bootstrap(bootstrap_status_t status, int progress)

1 0

[tor/release-0.2.2] Fix up some check-spaces issues
by arma＠torproject.org 11 May '11

11 May '11

commit 330116f0343e3b7b6632d3bd1b5c9f6bca87872d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 21:53:46 2011 -0400 Fix up some check-spaces issues --- src/common/compat.c | 1 - src/or/rendclient.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3644bd9..5797374 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2062,7 +2062,6 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf, return r; } - /** @{ */ /** As localtime_r, but defined for platforms that don't have it: * diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 8d024d8..e4a6d09 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -277,7 +277,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc, introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT; return 0; -perm_err: + perm_err: if (!introcirc->_base.marked_for_close) circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL); circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL);

1 0

[tor/release-0.2.2] Handle crypto_pk_get_digest failures semi-sensibly
by arma＠torproject.org 11 May '11

11 May '11

commit 66339f74b4affcb02a3160014efe6ce9aca339e1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed May 4 20:06:24 2011 -0700 Handle crypto_pk_get_digest failures semi-sensibly Fixes bug 3106. --- changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/changes/warn-if-get_digest-fails b/changes/warn-if-get_digest-fails new file mode 100644 index 0000000..6cfc108 --- /dev/null +++ b/changes/warn-if-get_digest-fails @@ -0,0 +1,6 @@ + o Minor bugfixes: + - If we fail to compute the identity digest of a v3 legacy + keypair, warn, and don't use a buffer-full of junk instead. + Bugfix on 0.2.1.1-alpha; fixes bug 3106. + + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index c8dda66..860ac1f 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2705,7 +2705,10 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_env_t *private_key, if (options->V3AuthUseLegacyKey) { authority_cert_t *c = get_my_v3_legacy_cert(); if (c) { - crypto_pk_get_digest(c->identity_key, voter->legacy_id_digest); + if (crypto_pk_get_digest(c->identity_key, voter->legacy_id_digest)) { + log_warn(LD_BUG, "Unable to compute digest of legacy v3 identity key"); + memset(voter->legacy_id_digest, 0, DIGEST_LEN); + } } } diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 9273dbc..db2eaf0 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3129,8 +3129,12 @@ dirvote_compute_consensuses(void) authority_cert_t *cert = get_my_v3_legacy_cert(); legacy_sign = get_my_v3_legacy_signing_key(); if (cert) { - crypto_pk_get_digest(cert->identity_key, legacy_dbuf); - legacy_id_digest = legacy_dbuf; + if (crypto_pk_get_digest(cert->identity_key, legacy_dbuf)) { + log_warn(LD_BUG, + "Unable to compute digest of legacy v3 identity key"); + } else { + legacy_id_digest = legacy_dbuf; + } } }

1 0

[tor/release-0.2.2] Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2
by arma＠torproject.org 11 May '11

11 May '11

commit 9583a534ac8801211b6c171c399f1ea6bb3cce1c Merge: ab1460f 66339f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 23:18:47 2011 -0400 Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2 changes/warn-if-get_digest-fails | 6 ++++++ src/or/dirserv.c | 5 ++++- src/or/dirvote.c | 8 ++++++-- 3 files changed, 16 insertions(+), 3 deletions(-)

1 0

[tor/release-0.2.2] Fix compile warning on windows
by arma＠torproject.org 11 May '11

11 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 sig */ void

1 0

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

11 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/release-0.2.2] More notes on how to upload tarballs from erinn
by arma＠torproject.org 11 May '11

11 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/release-0.2.2] Merge branch 'bug2379' into maint-0.2.2
by arma＠torproject.org 11 May '11

11 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/release-0.2.2] Fix circuit_list_path_impl(): internal circuits do not have an "exit". Trivial fix for 3079.
by arma＠torproject.org 11 May '11

11 May '11

commit 4126de6888de54b5fc825d209ff1bfbe73cd9514 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 3 21:53:13 2011 -0400 Fix circuit_list_path_impl(): internal circuits do not have an "exit". Trivial fix for 3079. --- src/or/circuitbuild.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 85765e3..0e033a5 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1506,7 +1506,7 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) circ->build_state->is_internal ? "internal" : "exit", circ->build_state->need_uptime ? " (high-uptime)" : "", circ->build_state->desired_path_len, - circ->_base.state == CIRCUIT_STATE_OPEN ? "" : ", exit ", + circ->_base.state == CIRCUIT_STATE_OPEN ? "" : ", last hop ", circ->_base.state == CIRCUIT_STATE_OPEN ? "" : (nickname?nickname:"*unnamed*")); smartlist_add(elements, cp);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2011