- tor-commits - lists.torproject.org

[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 20 Jun '11

20 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

[tor/master] Fix overwide line in config.c
by nickm＠torproject.org 20 Jun '11

20 Jun '11

commit 8653f31d8d534282795acb54ee500ef7d42d3a32 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 15:29:22 2011 -0400 Fix overwide line in config.c --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index c885046..df5cc86 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -310,7 +310,7 @@ static config_var_t _option_vars[] = { OBSOLETE("LogFile"), V(LogTimeGranularity, MSEC_INTERVAL, "1 second"), V(LongLivedPorts, CSV, - "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"), + "21,22,706,1863,5050,5190,5222,5223,6523,6667,6697,8300"), VAR("MapAddress", LINELIST, AddressMap, NULL), V(MaxAdvertisedBandwidth, MEMUNIT, "1 GB"), V(MaxCircuitDirtiness, INTERVAL, "10 minutes"),

1 0

[tor/master] Fix overwide lines in util.c
by nickm＠torproject.org 20 Jun '11

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

20 Jun '11

commit 997499369e8f2e022d2d923fa10e54a9370c1e1e Merge: 8b26554 1040cca Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 20 15:28:16 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/util.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.2.2] Fix overwide lines in util.c
by nickm＠torproject.org 20 Jun '11

20 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