- tor-commits - lists.torproject.org

[tor/master] forward-port the 0.2.2.29-beta changelog entry
by arma＠torproject.org 21 Jun '11

21 Jun '11

commit 37ff37a890fedc5db4bfbe55cd9bac9ee6572c21 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 21 01:18:58 2011 -0400 forward-port the 0.2.2.29-beta changelog entry --- ChangeLog | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 226d4eb..2a445e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,64 @@ +Changes in version 0.2.2.29-beta - 2011-06-20 + Tor 0.2.2.29-beta reverts an accidental behavior change for users who + have bridge lines in their torrc but don't want to use them; gets + us closer to having the control socket feature working on Debian; + and fixes a variety of smaller bugs. + + o Major bugfixes: + - Revert the UseBridges option to its behavior before 0.2.2.28-beta. + When we changed the default behavior to "use bridges if any + are listed in the torrc", we surprised users who had bridges + in their torrc files but who didn't actually want to use them. + Partial resolution for bug 3354. + + o Privacy fixes: + - Don't attach new streams to old rendezvous circuits after SIGNAL + NEWNYM. Previously, we would keep using an existing rendezvous + circuit if it remained open (i.e. if it were kept open by a + long-lived stream, or if a new stream were attached to it before + Tor could notice that it was old and no longer in use). Bugfix on + 0.1.1.15-rc; fixes bug 3375. + + o Minor bugfixes: + - Fix a bug when using ControlSocketsGroupWritable with User. The + directory's group would be checked against the current group, not + the configured group. Patch by Jérémy Bobbio. Fixes bug 3393; + bugfix on 0.2.2.26-beta. + - Make connection_printf_to_buf()'s behaviour sane. Its callers + expect it to emit a CRLF iff the format string ends with CRLF; + it actually emitted a CRLF iff (a) the format string ended with + CRLF or (b) the resulting string was over 1023 characters long or + (c) the format string did not end with CRLF *and* the resulting + string was 1021 characters long or longer. Bugfix on 0.1.1.9-alpha; + fixes part of bug 3407. + - Make send_control_event_impl()'s behaviour sane. Its callers + expect it to always emit a CRLF at the end of the string; it + might have emitted extra control characters as well. Bugfix on + 0.1.1.9-alpha; fixes another part of bug 3407. + - Make crypto_rand_int() check the value of its input correctly. + Previously, it accepted values up to UINT_MAX, but could return a + negative number if given a value above INT_MAX+1. Found by George + Kadianakis. Fixes bug 3306; bugfix on 0.2.2pre14. + - Avoid a segfault when reading a malformed circuit build state + with more than INT_MAX entries. Found by wanoskarnet. Bugfix on + 0.2.2.4-alpha. + - When asked about a DNS record type we don't support via a + client DNSPort, reply with NOTIMPL rather than an empty + reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha. + - Fix a rare memory leak during stats writing. Found by coverity. + + o Minor features: + - Update to the June 1 2011 Maxmind GeoLite Country database. + + o Code simplifications and refactoring: + - Remove some dead code as indicated by coverity. + - Remove a few dead assignments during router parsing. Found by + coverity. + - Add some forgotten return value checks during unit tests. Found + by coverity. + - Don't use 1-bit wide signed bit fields. Found by coverity. + + Changes in version 0.2.2.28-beta - 2011-06-04 Tor 0.2.2.28-beta makes great progress towards a new stable release: we fixed a big bug in whether relays stay in the consensus consistently,

1 0

[tor/release-0.2.2] add a blurb for 0.2.2.29-beta
by arma＠torproject.org 21 Jun '11

21 Jun '11

commit f0ba3c1f26c7e4d97273e941dc57f3c85d3f46f3 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 21 01:18:20 2011 -0400 add a blurb for 0.2.2.29-beta --- ChangeLog | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b9e43a..108ac61 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ Changes in version 0.2.2.29-beta - 2011-06-20 + Tor 0.2.2.29-beta reverts an accidental behavior change for users who + have bridge lines in their torrc but don't want to use them; gets + us closer to having the control socket feature working on Debian; + and fixes a variety of smaller bugs. + o Major bugfixes: - Revert the UseBridges option to its behavior before 0.2.2.28-beta. When we changed the default behavior to "use bridges if any @@ -17,13 +22,13 @@ Changes in version 0.2.2.29-beta - 2011-06-20 o Minor bugfixes: - Fix a bug when using ControlSocketsGroupWritable with User. The directory's group would be checked against the current group, not - the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix - on Tor 0.2.2.26-beta. + the configured group. Patch by Jérémy Bobbio. Fixes bug 3393; + bugfix on 0.2.2.26-beta. - Make connection_printf_to_buf()'s behaviour sane. Its callers expect it to emit a CRLF iff the format string ends with CRLF; it actually emitted a CRLF iff (a) the format string ended with CRLF or (b) the resulting string was over 1023 characters long or - (c) the format string did not end with CRLF ''and'' the resulting + (c) the format string did not end with CRLF *and* the resulting string was 1021 characters long or longer. Bugfix on 0.1.1.9-alpha; fixes part of bug 3407. - Make send_control_event_impl()'s behaviour sane. Its callers

1 0

[tor/maint-0.2.2] explain that the ./publish should happen soon after the scp
by arma＠torproject.org 21 Jun '11

21 Jun '11

commit b181985a8f98c0ba15230912f059e1fcf7c626f1 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Jun 21 00:37:18 2011 -0400 explain that the ./publish should happen soon after the scp otherwise you scp a tarball up but only one version of the website has it. --- doc/HACKING | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index 7ff9c5f..feeb05d 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -456,7 +456,6 @@ interesting and understandable. 2.7) Run it through fmt to make it pretty. - 3) Compose a short release blurb to highlight the user-facing changes. Insert said release blurb into the ChangeLog stanza. If it's a stable release, add it to the ReleaseNotes file too. If we're adding @@ -472,15 +471,19 @@ or somebody to try building it on Windows. 6) Get at least two of weasel/arma/karsten to put the new version number in their approved versions list. -7) Sign and push the tarball to the website in the dist/ directory. Sign -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 - /srv/www-master.torproject.org/htdocs/dist/ on vescum.) +7) Sign the tarball, then sign and push the git tag: + gpg -ba <the_tarball> + git tag -u <keyid> tor-0.2.x.y-status + git push origin tag tor-0.2.x.y-status + +8) scp the tarball and its sig to the website in the dist/ directory +(i.e. /srv/www-master.torproject.org/htdocs/dist/ on vescum). Edit +include/versions.wmi to note the new version. From your website checkout, +run ./publish to build and publish the website. -8) Edit include/versions.wmi to note the new version. From your website -checkout, run ./publish to build and publish the website. +Try not to delay too much between scp'ing the tarball and running +./publish -- the website has multiple A records and your scp only sent +it to one of them. 9) Email Erinn and weasel (cc'ing tor-assistants) that a new tarball is up. This step should probably change to mailing more packagers. @@ -498,3 +501,4 @@ changelog to tor-talk or tor-announce. (We might be moving to faster announcements, but don't announce until the website is at least updated.) +

1 0

[tor/release-0.2.2] Fix overwide lines in util.c
by arma＠torproject.org 21 Jun '11

21 Jun '11

commit 1040ccafb20d5d32cdf0945226f570dcbaf96e90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 15:28:06 2011 -0400 Fix overwide lines in util.c --- src/common/util.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 36aa9cc..b47b9c5 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1677,11 +1677,12 @@ file_status(const char *fname) * is group-readable, but in all cases we create the directory mode 0700. * If CPD_CHECK_MODE_ONLY is set, then we don't alter the directory permissions * if they are too permissive: we just return -1. - * When effective_user is not NULL, check permissions against the given user and - * its primary group. + * When effective_user is not NULL, check permissions against the given user + * and its primary group. */ int -check_private_dir(const char *dirname, cpd_check_t check, const char *effective_user) +check_private_dir(const char *dirname, cpd_check_t check, + const char *effective_user) { int r; struct stat st; @@ -1730,10 +1731,12 @@ check_private_dir(const char *dirname, cpd_check_t check, const char *effective_ } #ifndef MS_WINDOWS if (effective_user) { - /* Lookup the user and group information, if we have a problem, bail out. */ + /* Look up the user and group information. + * If we have a problem, bail out. */ pw = getpwnam(effective_user); if (pw == NULL) { - log_warn(LD_CONFIG, "Error setting configured user: %s not found", effective_user); + log_warn(LD_CONFIG, "Error setting configured user: %s not found", + effective_user); return -1; } running_uid = pw->pw_uid;

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 21 Jun '11

21 Jun '11

commit 2ea53fc0478aaf91c2dd11d520e02da9b2bebd94 Merge: 16e8951 1040cca Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jun 20 23:50:29 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 src/common/util.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)

1 0

[torbutton/master] Bug 3177: Update torbutton for new TorBrowser prefs.
by mikeperry＠torproject.org 21 Jun '11

21 Jun '11

commit 5a1ba687b4bf9666efa69d29ffad2a4aefcec13a Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jun 20 18:12:02 2011 -0700 Bug 3177: Update torbutton for new TorBrowser prefs. Turns out there's just one that makes sense to set right now. --- src/chrome/content/torbutton.js | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 720e281..08cb506 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1594,6 +1594,16 @@ function torbutton_update_status(mode, force_update) { m_tb_prefs.setIntPref("security.OCSP.enabled", 0); m_tb_prefs.setIntPref("security.OCSP.enabled", ocsp); + // This clears the STS cache and site permissions on Tor Browser + // XXX: Tie to some kind of disk-ok pref? + try { + m_tb_prefs.setBoolPref('permissions.memory_only', mode); + } catch(e) { + // Actually, this catch does not appear to be needed. Leaving it in for + // safety though. + torbutton_log(3, "Can't clear STS/Permissions: Not Tor Browser: "+e); + } + // This clears the undo tab history. var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo"); m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0);

1 0

[torbutton/master] Bug 3399: Fix a reversed boolean expression found by arno.
by mikeperry＠torproject.org 21 Jun '11

21 Jun '11

commit 4cbaf94e910727601013489b32fd3eaa1895bf39 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jun 20 17:45:57 2011 -0700 Bug 3399: Fix a reversed boolean expression found by arno. Thanks arno. --- src/components/cookie-jar-selector.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index c80d662..7b4b841 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -167,7 +167,7 @@ function CookieJarSelector() { var name = tor_enabled? "tor" : "nontor"; var cookies = this.getProtectedCookies(name); - if (cookies.toString() == "" || cookies == null) + if (cookies == null || cookies.toString() == "") cookies = new XML('<cookies/>'); var xml = <cookie>{cookie.value}</cookie>; xml.@name = cookie.name;

1 0

[tor/master] Fix tor-fw-helper-natpmp.c API usage
by arma＠torproject.org 21 Jun '11

21 Jun '11

commit 8b0d9452ca2053bbfba60750d169aaf52037cfcd Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Sun Jun 19 02:31:13 2011 -0700 Fix tor-fw-helper-natpmp.c API usage libnatpmp-20110618 changed the API that tor-fw-helper used and for a time tor-fw-helper could not build against the newest libnatpmp. This patch brings support for libnatpmp to tor-fw-helper. --- changes/bug3434 | 2 ++ configure.in | 2 +- src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/changes/bug3434 b/changes/bug3434 new file mode 100644 index 0000000..24ee518 --- /dev/null +++ b/changes/bug3434 @@ -0,0 +1,2 @@ + o Minor bugfixes: + - Update tor-fw-helper to support libnatpmp-20110618; fixes 3434. diff --git a/configure.in b/configure.in index e5db370..12922ae 100644 --- a/configure.in +++ b/configure.in @@ -545,7 +545,7 @@ if test "$natpmp" = "true"; then [ int r; natpmp_t natpmp; natpmpresp_t response; - r = initnatpmp(&natpmp);], + r = initnatpmp(&natpmp, 0, 0);], [printf("initnatpmp() returned %d (%s)\n", r, r?"FAILED":"SUCCESS"); exit(0);], [--with-libnatpmp-dir], diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c index 2630b8f..f9d5d0d 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -55,7 +55,7 @@ tor_natpmp_init(tor_fw_options_t *tor_fw_options, void *backend_state) if (tor_fw_options->verbose) fprintf(stdout, "V: natpmp init...\n"); - r = initnatpmp(&(state->natpmp)); + r = initnatpmp(&(state->natpmp), 0, 0); if (r == 0) { state->init = 1; fprintf(stdout, "tor-fw-helper: natpmp initialized...\n");

1 0

[torflow/master] Ticket #1975: Improve slice file distribution.
by mikeperry＠torproject.org 21 Jun '11

21 Jun '11

commit a0a57efd548143688921a7c13d2bf6150d925a4d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Jun 20 14:09:20 2011 -0700 Ticket #1975: Improve slice file distribution. Values may not be final. Seeing what effect this has. --- NetworkScanners/BwAuthority/bwauthority.py | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority.py b/NetworkScanners/BwAuthority/bwauthority.py index 236e502..70a8344 100755 --- a/NetworkScanners/BwAuthority/bwauthority.py +++ b/NetworkScanners/BwAuthority/bwauthority.py @@ -49,11 +49,13 @@ user_agent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.37 # TODO: We'll also want to try to prefer pairing unmeasured nodes # together then, and use a different url set for them. # cutoff percent URL -urls = [(10, "https://38.229.70.2/2M"), - (20, "https://38.229.70.2/1M"), - (30, "https://38.229.70.2/512k"), - (50, "https://38.229.70.2/256k"), - (100, "https://38.229.70.2/128k")] +urls = [(5, "https://38.229.70.2/16M"), # fbw 1499k..500k + (10, "https://38.229.70.2/8M"), # fbw 500k..350k + (20, "https://38.229.70.2/4M"), # fbw 350k..200k + (30, "https://38.229.70.2/2M"), # fbw 200k..128k + (50, "https://38.229.70.2/512k"), # fbw 128k..50k + (80, "https://38.229.70.2/256k"), # fbw 50k..26k + (100, "https://38.229.70.2/128k")] # fbw 26k..10k # Do NOT modify this object directly after it is handed to PathBuilder

1 0

[torbrowser/maint-2.2] update HACKING doc with information about patch format and how to contribute
by erinn＠torproject.org 20 Jun '11

20 Jun '11

commit 0c56c7b88522d5f0b135366d80c652f27c4f9909 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Jun 20 16:45:47 2011 -0300 update HACKING doc with information about patch format and how to contribute --- docs/HACKING | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/docs/HACKING b/docs/HACKING index 03ad072..ce020ac 100644 --- a/docs/HACKING +++ b/docs/HACKING @@ -42,7 +42,8 @@ Modifications ---------------------- Some components of TBB are modified and all of the patches are available in the -git repository in src/current-patches. +git repository in src/current-patches. Within each patch is an explanation of +what the patch does. Please see them for more information. - Vidalia: modified on Linux and OS X * Vidalia has been patched for Linux in order to allow it to quit at the same @@ -171,3 +172,42 @@ whether they should be kept around in perpetuity is undecided at this moment. Official TBB releases for more than one architecture must use 'arch' in the filename. + +Patch format +---------------------- + +The patches for TBB components live in torbrowser.git/src/current-patches and +are in the following format: + +001-component-patch-summary.patch + +Please see TBB's git for a list of current patches: +https://gitweb.torproject.org/torbrowser.git/tree/refs/heads/maint-2.2:/src/current-patches + +If the patch is against anything in the existing torbrowser.git, do: + +$ git clone git://git.torproject.org/torbrowser.git + +If it's against an existing tarball of some component in TBB (such as Firefox, +OpenSSL, or Vidalia), you can use git format-patch by doing the following: + +$ cd srcdir && git init && git add --ignore-errors .; git commit -m "`basename $PWD`" + +Make your changes, then: + +$ git format-patch origin/master + +Make sure to add a sufficiently explanatory summary of the changes since future +people will be looking in the patch to see why it's being used. + +You may have to change the filename of the patch to fit appropriately in the +patch series if there are pre-existing patches. + +Submitting patches +---------------------- + +File a ticket on https://trac.torproject.org for the Tor bundles/installation +component and attach the patch. + +If you're a Tor developer and have a personal torbrowser.git, just tell me +which branch your changes are in.

1 0