- tor-commits - lists.torproject.org

[tor/master] Increment version to 0.2.3.1-alpha
by nickm＠torproject.org 05 May '11

05 May '11

commit 5ed719fd6c7c7057de7392785f327fdbc55000ae Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 13:42:03 2011 -0400 Increment version to 0.2.3.1-alpha --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index b7e4180..0918c95 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.0-alpha-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.1-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 1cecf34..82e9468 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.0-alpha-dev" +!define VERSION "0.2.3.1-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index dc84d78..f4efc0c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,4 +233,4 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.0-alpha-dev" +#define VERSION "0.2.3.1-alpha"

1 0

[tor/master] Tweak 0.2.3.1-alpha changelog, add more entries.
by nickm＠torproject.org 05 May '11

05 May '11

commit 3b0140b81130a545c4effb41df39fbd155f59f24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 5 13:43:15 2011 -0400 Tweak 0.2.3.1-alpha changelog, add more entries. --- ChangeLog | 35 ++++++++++++++++++++++++----------- changes/bug2379 | 5 ----- changes/warn-if-get_digest-fails | 6 ------ 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d779c3..046ee63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.3.1-alpha - 2011-05-0? +Changes in version 0.2.3.1-alpha - 2011-05-05 Tor 0.2.3.1-alpha adds some new experimental features, including support for an improved network IO backend, IOCP networking on Windows, @@ -6,6 +6,10 @@ Changes in version 0.2.3.1-alpha - 2011-05-0? home router configuration. There are also numerous internal improvements to try to make the code easier for developers to work with. + This is the first alpha release in a new series, so expect there to be + bugs. Users who would rather test out a more stable branch should + stay with 0.2.2.x for now. + o Major features - Tor can now optionally build with the "bufferevents" buffered IO backend provided by Libevent 2. To use this feature, make sure you @@ -24,7 +28,7 @@ Changes in version 0.2.3.1-alpha - 2011-05-0? - The EntryNodes option can now include country codes like {de} or IP addresses or network masks. Previously we had disallowed these options because we didn't have an efficient way to keep the list up to - date. Fixes bug 1982. + date. Fixes bug 1982, but see bug 2798 for an unresolved issue here. - Exit nodes now accept and queue data on not-yet-connected streams. Previously, the client wasn't allowed to send data until the stream was connected, which slowed down all connections. This change will enable @@ -47,18 +51,21 @@ Changes in version 0.2.3.1-alpha - 2011-05-0? by downloading microdescriptors instead of router descriptors. o Minor features: - - Make logging resolution configurable and change default from 1 - millisecond to 1 second. Implements enhancement 1668. - - We log which torrc file we're using on startup. Implements ticket 2444. + - Make logging resolution configurable with a new LogGranularity + option, and change the default from 1 millisecond to 1 + second. Implements enhancement 1668. + - We log which torrc file we're using on startup. Implements ticket + 2444. - Ordinarily, Tor does not count traffic from private addresses (like 127.0.0.1 or 10.0.0.1) when calculating rate limits or accounting. There is now a new option, CountPrivateBandwidth, to disable this behavior. Patch from Daniel Cagara. - - New --enable-static-tor configure option for building Tor as statically - as possible. Idea, general hackery and thoughts from Alexei Czeskis, - John Gilmore, Jacob Appelbaum. Implements ticket 2702. - - If you set the NumCPUs option to 0, Tor will now try to detect how many - CPUs you have. This is the new default behavior. + - New --enable-static-tor configure option for building Tor as + statically as possible. Idea, general hackery and thoughts from + Alexei Czeskis, John Gilmore, Jacob Appelbaum. Implements ticket + 2702. + - If you set the NumCPUs option to 0, Tor will now try to detect how + many CPUs you have. This is the new default behavior. - Turn on directory request statistics by default and include them in extra-info descriptors. Don't break if we have no GeoIP database. - Relays that set "ConnDirectionStatistics 1" write statistics on the @@ -79,6 +86,9 @@ Changes in version 0.2.3.1-alpha - 2011-05-0? - The microdesc journal is supposed to get rebuilt only if it is at least _half_ the length of the store, not _twice_ the length of the store. Bugfix on 0.2.2.6-alpha; fixes part of bug 2230. + - If as an authority 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. - Authorities now clean their microdesc cache periodically and when reading from disk initially, not only when adding new descriptors. This prevents a bug where we could lose microdescriptors. Bugfix @@ -122,12 +132,15 @@ Changes in version 0.2.3.1-alpha - 2011-05-0? our library structure used to force them to link it. o Removed features: - - Removed some old code to work around even older versions of Tor that + - Remove some old code to work around even older versions of Tor that used forked processes to handle DNS requests. Such versions of Tor are no longer in use as servers. o Documentation fixes: - Correct a broken faq link in the INSTALL file. Fixes bug 2307. + - Add missing documentation for the authority-related torrc options + RephistTrackTime, BridgePassword, and V3AuthUseLegacyKey. Resolves + issue 2379. Changes in version 0.2.2.25-alpha - 2011-04-29 diff --git a/changes/bug2379 b/changes/bug2379 deleted file mode 100644 index 0d378b7..0000000 --- a/changes/bug2379 +++ /dev/null @@ -1,5 +0,0 @@ - o Documentation: - - Add missing documentation for the authority-related torrc options - RephistTrackTime, BridgePassword, and V3AuthUseLegacyKey. Resolves - issue 2379. - diff --git a/changes/warn-if-get_digest-fails b/changes/warn-if-get_digest-fails deleted file mode 100644 index 6cfc108..0000000 --- a/changes/warn-if-get_digest-fails +++ /dev/null @@ -1,6 +0,0 @@ - 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. - -

1 0

[tor/master] Use read_all() to read messages from spawn_background
by nickm＠torproject.org 05 May '11

05 May '11

commit d8cb4f9f0ce075daf4469db18218901f3a720282 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 23:32:18 2011 -0400 Use read_all() to read messages from spawn_background Using read() is an invitation to get some of the data you want, not all. Possible fix for bug 2462 --- src/test/test_util.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index 25fd51c..efbc47b 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1367,7 +1367,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, pid = retval; /* Check stdout */ - pos = read(stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1); + pos = read_all(stdout_pipe, stdout_buf, sizeof(stdout_buf) - 1, 0); stdout_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_out)); tt_str_op(stdout_buf, ==, expected_out); @@ -1381,7 +1381,7 @@ run_util_spawn_background(const char *argv[], const char *expected_out, tt_assert(!WIFSTOPPED(stat_loc)); /* Check stderr */ - pos = read(stderr_pipe, stderr_buf, sizeof(stderr_buf) - 1); + pos = read_all(stderr_pipe, stderr_buf, sizeof(stderr_buf) - 1, 0); stderr_buf[pos] = '\0'; tt_int_op(pos, ==, strlen(expected_err)); tt_str_op(stderr_buf, ==, expected_err);

1 0

[tor/master] Handle crypto_pk_get_digest failures semi-sensibly
by nickm＠torproject.org 05 May '11

05 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/master] Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2
by nickm＠torproject.org 05 May '11

05 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/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 05 May '11

05 May '11

commit 08efa70c41b258d8655ec01bdb721aea96b42d46 Merge: 7de3a19 9583a53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 4 23:29:56 2011 -0400 Merge remote-tracking branch 'origin/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/maint-0.2.2] Merge remote-tracking branch 'rransom/bug3106' into maint-0.2.2
by nickm＠torproject.org 05 May '11

05 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/maint-0.2.2] Handle crypto_pk_get_digest failures semi-sensibly
by nickm＠torproject.org 05 May '11

05 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

[arm/master] fix: Initializing all panels to be hidden
by atagar＠torproject.org 05 May '11

05 May '11

commit a45b4fd97a801d22b2bf66f2809e560523738e63 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 4 19:36:19 2011 -0700 fix: Initializing all panels to be hidden A recent change to pausing functionality caused a timing issue where the log panel would redraw before being properly placed. The result was that the log panle's title flashes at the top of the screen at startup. This starts that panel (and all others) as hidden on init. --- src/cli/controller.py | 2 ++ src/util/panel.py | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 512e5ba..b8bb5cd 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -651,6 +651,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): lastSize = None # sets initial visiblity for the pages + for entry in PAGE_S: panels[entry].setVisible(True) + for i in range(len(PAGES)): isVisible = i == page for entry in PAGES[i]: panels[entry].setVisible(isVisible) diff --git a/src/util/panel.py b/src/util/panel.py index 4f8763c..9c3dd29 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -60,7 +60,7 @@ class Panel(): self.panelName = name self.parent = parent - self.visible = True + self.visible = False # Attributes for pausing. The pauseAttr contains variables our getAttr # method is tracking, and the pause buffer has copies of the values from

1 0

[arm/master] fix: Don't revert quit confirmation if 'yes'
by atagar＠torproject.org 05 May '11

05 May '11

commit 45adb1c8036ef0b89eb58606fc2c559b38c82a27 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 4 19:10:56 2011 -0700 fix: Don't revert quit confirmation if 'yes' Due to changes in pause functionality the message when confirming that you want to quit would be reverted, even when you answer 'yes' to shut arm down (just a brief flicker while quitting). --- src/cli/controller.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 91c34df..512e5ba 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -808,7 +808,8 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): quitConfirmed = confirmationKey in (ord('q'), ord('Q')) curses.halfdelay(REFRESH_RATE * 10) - panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) + if not quitConfirmed: + panels["control"].setMsg(CTL_PAUSED if isPaused else CTL_HELP) setPauseState(panels, isPaused, page) finally: panel.CURSES_LOCK.release()

1 0