August 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Update main Changelog with newer 3.6.4 material.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 4426a4daed68c08d4582b8b713b0dd3bdf397b82 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:06:37 2014 -0700 Update main Changelog with newer 3.6.4 material. --- Bundle-Data/Docs/ChangeLog.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9626ceb..8eb4284 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 +Tor Browser Bundle 4.0-alpha-1 -- Aug 8 2014 * All Platforms * Ticket 10935: Include the Meek Pluggable Transport (version 0.10) * Two modes of Meek are provided: Meek over Google and Meek over Amazon @@ -31,10 +31,15 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation * Bug 12249: Don't create PT debug files anymore -Tor Browser Bundle 3.6.4 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Update OpenSSL to 1.0.1i + * Backported Tor Patches: + * Bug 11654: Properly apply the fix for malformed bug11156 log message + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1

1 0

[tor-browser-bundle/maint-3.6] Apply rebased Bug11200-hang fix.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 91751b52e06a3fe5dd94eb4fa045ac75859d5842 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 16:04:17 2014 -0700 Apply rebased Bug11200-hang fix. --- Bundle-Data/Docs/ChangeLog.txt | 2 + gitian/descriptors/linux/gitian-tor.yml | 2 + gitian/descriptors/mac/gitian-tor.yml | 2 + gitian/descriptors/windows/gitian-tor.yml | 2 + gitian/patches/bug11200-hang-0.2.4.patch | 66 +++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e986467..d0336d7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,8 @@ Tor Browser Bundle 3.6.4 -- Aug 8 2014 * Update OpenSSL to 1.0.1i * Backported Tor Patches: * Bug 11654: Properly apply the fix for malformed bug11156 log message + * Bug 11200: Fix a hang during bootstrap introduced in the initial + bug11200 patch. * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 27e242b..fa1badb 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -30,6 +30,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.4.patch" - "dzip.sh" - "openssl-linux32-utils.zip" - "openssl-linux64-utils.zip" @@ -80,6 +81,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 054e1a8..5e1ea0f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "bug11069.patch" - "bug9665.patch" - "bug8402.patch" +- "bug11200-hang-0.2.4.patch" - "bug8402-master.patch" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" @@ -76,6 +77,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index aea69b9..7d244ae 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -28,6 +28,7 @@ files: - "bug9665.patch" - "bug8402.patch" - "bug8402-master.patch" +- "bug11200-hang-0.2.4.patch" - "binutils.tar.bz2" - "dzip.sh" - "binutils-win32-utils.zip" @@ -77,6 +78,7 @@ script: | git am ~/build/bug9665.patch git am ~/build/bug11200.patch git am ~/build/bug8402.patch + git am ~/build/bug11200-hang-0.2.4.patch else git am ~/build/bug8402-master.patch fi diff --git a/gitian/patches/bug11200-hang-0.2.4.patch b/gitian/patches/bug11200-hang-0.2.4.patch new file mode 100644 index 0000000..6bac5e4 --- /dev/null +++ b/gitian/patches/bug11200-hang-0.2.4.patch @@ -0,0 +1,66 @@ +From 813dc75f717cab1f7896c77e838c496daa3e4deb Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Wed, 6 Aug 2014 15:57:24 -0700 +Subject: [PATCH] Build circuits more readily when DisableNetwork goes to 0 + +When Tor starts with DisabledNetwork set, it would correctly +conclude that it shouldn't try making circuits, but it would +mistakenly cache this conclusion and continue believing it even +when DisableNetwork is set to 0. Fixes the bug introduced by the +fix for bug 11200; bugfix on 0.2.5.4-alpha. +--- + src/or/nodelist.c | 21 ++++++++++++--------- + 1 file changed, 12 insertions(+), 9 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index e814e16..18b6677 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1240,10 +1240,21 @@ static char dir_info_status[256] = ""; + int + router_have_minimum_dir_info(void) + { ++ static int logged_delay=0; ++ const char *delay_fetches_msg = NULL; ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ if (!logged_delay) ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ logged_delay=1; ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); ++ return 0; ++ } ++ logged_delay = 0; /* reset it if we get this far */ ++ + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { + update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; + } ++ + return have_min_dir_info; + } + +@@ -1439,7 +1450,6 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; +- const char *delay_fetches_msg = NULL; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1452,13 +1462,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + +- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); +- res = 0; +- goto done; +- } +- + using_md = consensus->flavor == FLAV_MICRODESC; + + { +-- +1.9.1 +

1 0

[tor-browser-bundle/master] Replace bug11200 patch with squashed version.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit d624e24bd780a11c289168d88f703b885f25ff6c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:51:07 2014 -0700 Replace bug11200 patch with squashed version. --- gitian/patches/bug11200-hang-0.2.5.patch | 197 ++++-------------------------- 1 file changed, 21 insertions(+), 176 deletions(-) diff --git a/gitian/patches/bug11200-hang-0.2.5.patch b/gitian/patches/bug11200-hang-0.2.5.patch index a95afb2..76cd159 100644 --- a/gitian/patches/bug11200-hang-0.2.5.patch +++ b/gitian/patches/bug11200-hang-0.2.5.patch @@ -1,61 +1,7 @@ -From 2897735249dfe2de11b2f2e777aa35e1b1926329 Mon Sep 17 00:00:00 2001 +From fcac4b4467427e8f6ad948e8c8e6f34a0131e716 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 16:54:46 -0400 -Subject: [PATCH 1/4] move the consensus check below the disablednetwork check - -should have no impact in practice ---- - src/or/nodelist.c | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index 8f87081..a33a8b2 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1495,11 +1495,20 @@ update_router_have_minimum_dir_info(void) - time_t now = time(NULL); - int res; - const or_options_t *options = get_options(); -- const networkstatus_t *consensus = -- networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ const networkstatus_t *consensus; - int using_md; - const char *delay_fetches_msg = NULL; - -+ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -+ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); -+ res = 0; -+ goto done; -+ } -+ -+ consensus = -+ networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ - if (!consensus) { - if (!networkstatus_get_latest_consensus()) - strlcpy(dir_info_status, "We have no usable consensus.", -@@ -1511,13 +1520,6 @@ update_router_have_minimum_dir_info(void) - goto done; - } - -- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); -- res = 0; -- goto done; -- } -- - using_md = consensus->flavor == FLAV_MICRODESC; - - { --- -1.9.1 - -From 9c62f4677d49073332bfcdd2f8c61229c943fd22 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Tue, 5 Aug 2014 17:04:39 -0400 -Subject: [PATCH 2/4] Build circuits more readily when DisableNetwork goes to 0 +Subject: [PATCH] Build circuits more readily when DisableNetwork goes to 0 When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would @@ -64,8 +10,8 @@ when DisableNetwork is set to 0. Fixes the bug introduced by the fix for bug 11200; bugfix on 0.2.5.4-alpha. --- changes/bug11200-caching | 7 +++++++ - src/or/nodelist.c | 10 ++++++++-- - 2 files changed, 15 insertions(+), 2 deletions(-) + src/or/nodelist.c | 21 ++++++++++++--------- + 2 files changed, 19 insertions(+), 9 deletions(-) create mode 100644 changes/bug11200-caching diff --git a/changes/bug11200-caching b/changes/bug11200-caching @@ -82,97 +28,10 @@ index 0000000..e3fbaec + fix for bug 11200; bugfix on 0.2.5.4-alpha. + diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index a33a8b2..c863663 100644 +index 8f87081..7b1f338 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c -@@ -1494,16 +1494,21 @@ update_router_have_minimum_dir_info(void) - { - time_t now = time(NULL); - int res; -+ static int disabled=0; - const or_options_t *options = get_options(); - const networkstatus_t *consensus; - int using_md; - const char *delay_fetches_msg = NULL; - - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); -+ if (!disabled) -+ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; -+ disabled = 1; - goto done; -+ } else { -+ disabled = 0; - } - - consensus = -@@ -1568,6 +1573,7 @@ update_router_have_minimum_dir_info(void) - control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); - } - have_min_dir_info = res; -- need_to_update_have_min_dir_info = 0; -+ if (!disabled) -+ need_to_update_have_min_dir_info = 0; - } - --- -1.9.1 - -From a8f3a72027f35284b2115b078ef8a39c60e5f054 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Tue, 5 Aug 2014 17:33:33 -0400 -Subject: [PATCH 3/4] Stop redundant clearing of - need_to_update_have_min_dir_info - -We were clearing it in router_have_minimum_dir_info() as well as in -update_router_have_minimum_dir_info(). ---- - src/or/nodelist.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index c863663..6eb286f 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1277,7 +1277,6 @@ router_have_minimum_dir_info(void) - { - if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { - update_router_have_minimum_dir_info(); -- need_to_update_have_min_dir_info = 0; - } - return have_min_dir_info; - } -@@ -1488,7 +1487,7 @@ get_frac_paths_needed_for_circs(const or_options_t *options, - - /** Change the value of have_min_dir_info, setting it true iff we have enough - * network and router information to build circuits. Clear the value of -- * need_to_update_have_min_dir_info. */ -+ * need_to_update_have_min_dir_info if we're confident of our answer. */ - static void - update_router_have_minimum_dir_info(void) - { --- -1.9.1 - -From 3605a9bade91f78b139f4900830836d82abadf15 Mon Sep 17 00:00:00 2001 -From: Roger Dingledine <arma(a)torproject.org> -Date: Wed, 6 Aug 2014 02:11:52 -0400 -Subject: [PATCH 4/4] refactor DisableNetwork check - -Move the block from update_router_have_minimum_dir_info() to -router_have_minimum_dir_info() so it's clearer that it's not -actually updating the variable. ---- - src/or/nodelist.c | 34 +++++++++++++++------------------- - 1 file changed, 15 insertions(+), 19 deletions(-) - -diff --git a/src/or/nodelist.c b/src/or/nodelist.c -index 6eb286f..57b0bce 100644 ---- a/src/or/nodelist.c -+++ b/src/or/nodelist.c -@@ -1275,9 +1275,21 @@ static char dir_info_status[256] = ""; +@@ -1275,10 +1275,21 @@ static char dir_info_status[256] = ""; int router_have_minimum_dir_info(void) { @@ -189,48 +48,34 @@ index 6eb286f..57b0bce 100644 + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { update_router_have_minimum_dir_info(); +- need_to_update_have_min_dir_info = 0; } + return have_min_dir_info; } -@@ -1493,25 +1505,10 @@ update_router_have_minimum_dir_info(void) - { - time_t now = time(NULL); - int res; -- static int disabled=0; - const or_options_t *options = get_options(); -- const networkstatus_t *consensus; -- int using_md; +@@ -1498,7 +1509,6 @@ update_router_have_minimum_dir_info(void) + const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); + int using_md; - const char *delay_fetches_msg = NULL; -- + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1511,13 +1521,6 @@ update_router_have_minimum_dir_info(void) + goto done; + } + - if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { -- if (!disabled) -- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); - strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); - res = 0; -- disabled = 1; - goto done; -- } else { -- disabled = 0; - } - -- consensus = -+ const networkstatus_t *consensus = - networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); -+ int using_md; - - if (!consensus) { - if (!networkstatus_get_latest_consensus()) -@@ -1572,7 +1569,6 @@ update_router_have_minimum_dir_info(void) - control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); - } - have_min_dir_info = res; -- if (!disabled) -- need_to_update_have_min_dir_info = 0; -+ need_to_update_have_min_dir_info = 0; - } + using_md = consensus->flavor == FLAV_MICRODESC; + { -- 1.9.1

1 0

[tor-browser-bundle/master] Update OpenSSL to 1.0.1i.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit c3f95315259334409b916c511ea43f4abf127b41 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:32:25 2014 -0700 Update OpenSSL to 1.0.1i. --- Bundle-Data/Docs/ChangeLog.txt | 1 + gitian/versions.alpha | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index f1f647d..9626ceb 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014 * Two modes of Meek are provided: Meek over Google and Meek over Amazon * Update Firefox to 24.7.0esr * Update Tor to 0.2.5.6-alpha + * Update OpenSSL to 1.0.1i * Update NoScript to 2.6.8.36 * Script permissions now apply based on URL bar * Update HTTPS Everywhere to 5.0development.0 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d889402..52d0b9b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -27,7 +27,7 @@ MEEK_TAG=0.10 GITIAN_TAG=tor-browser-builder-3.x-6 -OPENSSL_VER=1.0.1h +OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.24 @@ -72,7 +72,7 @@ PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz GO_PACKAGE=go${GO_VER}.src.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 +OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/master] Update 11200 patch to include Roger's refactoring.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit 3385f5755dc8e10f1829b35ddfb6619a9b5ced7a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:29:13 2014 -0700 Update 11200 patch to include Roger's refactoring. --- gitian/patches/bug11200-hang-0.2.5.patch | 84 ++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/gitian/patches/bug11200-hang-0.2.5.patch b/gitian/patches/bug11200-hang-0.2.5.patch index 00664a4..a95afb2 100644 --- a/gitian/patches/bug11200-hang-0.2.5.patch +++ b/gitian/patches/bug11200-hang-0.2.5.patch @@ -1,7 +1,7 @@ From 2897735249dfe2de11b2f2e777aa35e1b1926329 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 16:54:46 -0400 -Subject: [PATCH 1/3] move the consensus check below the disablednetwork check +Subject: [PATCH 1/4] move the consensus check below the disablednetwork check should have no impact in practice --- @@ -55,7 +55,7 @@ index 8f87081..a33a8b2 100644 From 9c62f4677d49073332bfcdd2f8c61229c943fd22 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 17:04:39 -0400 -Subject: [PATCH 2/3] Build circuits more readily when DisableNetwork goes to 0 +Subject: [PATCH 2/4] Build circuits more readily when DisableNetwork goes to 0 When Tor starts with DisabledNetwork set, it would correctly conclude that it shouldn't try making circuits, but it would @@ -123,7 +123,7 @@ index a33a8b2..c863663 100644 From a8f3a72027f35284b2115b078ef8a39c60e5f054 Mon Sep 17 00:00:00 2001 From: Roger Dingledine <arma(a)torproject.org> Date: Tue, 5 Aug 2014 17:33:33 -0400 -Subject: [PATCH 3/3] Stop redundant clearing of +Subject: [PATCH 3/4] Stop redundant clearing of need_to_update_have_min_dir_info We were clearing it in router_have_minimum_dir_info() as well as in @@ -156,3 +156,81 @@ index c863663..6eb286f 100644 -- 1.9.1 +From 3605a9bade91f78b139f4900830836d82abadf15 Mon Sep 17 00:00:00 2001 +From: Roger Dingledine <arma(a)torproject.org> +Date: Wed, 6 Aug 2014 02:11:52 -0400 +Subject: [PATCH 4/4] refactor DisableNetwork check + +Move the block from update_router_have_minimum_dir_info() to +router_have_minimum_dir_info() so it's clearer that it's not +actually updating the variable. +--- + src/or/nodelist.c | 34 +++++++++++++++------------------- + 1 file changed, 15 insertions(+), 19 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index 6eb286f..57b0bce 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1275,9 +1275,21 @@ static char dir_info_status[256] = ""; + int + router_have_minimum_dir_info(void) + { ++ static int logged_delay=0; ++ const char *delay_fetches_msg = NULL; ++ if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { ++ if (!logged_delay) ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ logged_delay=1; ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); ++ return 0; ++ } ++ logged_delay = 0; /* reset it if we get this far */ ++ + if (PREDICT_UNLIKELY(need_to_update_have_min_dir_info)) { + update_router_have_minimum_dir_info(); + } ++ + return have_min_dir_info; + } + +@@ -1493,25 +1505,10 @@ update_router_have_minimum_dir_info(void) + { + time_t now = time(NULL); + int res; +- static int disabled=0; + const or_options_t *options = get_options(); +- const networkstatus_t *consensus; +- int using_md; +- const char *delay_fetches_msg = NULL; +- +- if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- if (!disabled) +- log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); +- res = 0; +- disabled = 1; +- goto done; +- } else { +- disabled = 0; +- } +- +- consensus = ++ const networkstatus_t *consensus = + networkstatus_get_reasonably_live_consensus(now,usable_consensus_flavor()); ++ int using_md; + + if (!consensus) { + if (!networkstatus_get_latest_consensus()) +@@ -1572,7 +1569,6 @@ update_router_have_minimum_dir_info(void) + control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO"); + } + have_min_dir_info = res; +- if (!disabled) +- need_to_update_have_min_dir_info = 0; ++ need_to_update_have_min_dir_info = 0; + } + +-- +1.9.1 +

1 0

[tor-browser-bundle/maint-3.6] Update OpenSSL to 1.0.1i.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit e5d2beddeab6cb4cb0c8c0e8c7ae67659f493159 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:34:00 2014 -0700 Update OpenSSL to 1.0.1i. --- Bundle-Data/Docs/ChangeLog.txt | 3 ++- gitian/versions | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 88bb0d6..e986467 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,8 @@ -Tor Browser Bundle 3.6.4 -- Aug 6 2014 +Tor Browser Bundle 3.6.4 -- Aug 8 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Update OpenSSL to 1.0.1i * Backported Tor Patches: * Bug 11654: Properly apply the fix for malformed bug11156 log message * Update NoScript to 2.6.8.36 diff --git a/gitian/versions b/gitian/versions index b62e547..e700ad3 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GITIAN_TAG=tor-browser-builder-3.x-6 -OPENSSL_VER=1.0.1h +OPENSSL_VER=1.0.1i GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION BINUTILS_VER=2.22 @@ -69,7 +69,7 @@ LXML_PACKAGE=lxml-${LXML_VER}.tar.gz PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz # Hashes for packages with weak sigs or no sigs -OPENSSL_HASH=9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093 +OPENSSL_HASH=3c179f46ca77069a6a0bac70212a9b3b838b2f66129cb52d568837fc79d8fcc7 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645

1 0

[tor-browser-bundle/maint-3.6] Properly apply patch 11654.
by mikeperry＠torproject.org 06 Aug '14

06 Aug '14

commit b1aac2b64d108dd0d8e3b0ce90b5275d06bf76b4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Aug 6 15:24:50 2014 -0700 Properly apply patch 11654. --- Bundle-Data/Docs/ChangeLog.txt | 2 ++ gitian/patches/bug11156.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 38eef4b..88bb0d6 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -2,6 +2,8 @@ Tor Browser Bundle 3.6.4 -- Aug 6 2014 * All Platforms * Update Tor to 0.2.4.23 * Update Tor launcher to 0.2.5.6 + * Backported Tor Patches: + * Bug 11654: Properly apply the fix for malformed bug11156 log message * Update NoScript to 2.6.8.36 * Bug 9516: Send Tor Launcher log messages to Browser Console * Update Torbutton to 1.6.11.1 diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch index d9f8e7a..68fcde9 100644 --- a/gitian/patches/bug11156.patch +++ b/gitian/patches/bug11156.patch @@ -273,3 +273,30 @@ index 0000000..97c70b2 -- 1.9.1 +From 6a584ab03670b40031704f2c32bd8f41cb74d694 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Thu, 1 May 2014 14:44:29 +0100 +Subject: [PATCH 1/2] Fix a misuse of strlcpy() introduced by the #11156 patch. + +--- + src/or/nodelist.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index a38a6d4..09232f9 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1510,8 +1510,8 @@ update_router_have_minimum_dir_info(void) + } + + if (should_delay_dir_fetches(get_options(), &delay_fetches_msg)) { +- log_notice(LD_DIR, "Delaying dir fetches: %s", delay_fetches_msg); +- strlcpy(dir_info_status, "%s", sizeof(dir_info_status)); ++ log_notice(LD_DIR, "Delaying directory fetches: %s", delay_fetches_msg); ++ strlcpy(dir_info_status, delay_fetches_msg, sizeof(dir_info_status)); + res = 0; + goto done; + } +-- +1.9.1 +

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 06 Aug '14

06 Aug '14

commit 5645b5e6c72d46da3482b589fd09cf1263de6b21 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 6 21:15:44 2014 +0000 Update translations for tails-misc_completed --- fa.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/fa.po b/fa.po index 7f6433f..63dec6d 100644 --- a/fa.po +++ b/fa.po @@ -8,14 +8,15 @@ # Danial Keshani <dani(a)daanial.com>, 2013 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # Gilberto, 2014 +# johnholzer <johnholtzer123(a)gmail.com>, 2014 # Mohammad Hossein <desmati(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-Revision-Date: 2014-06-24 13:41+0000\n" -"Last-Translator: Gilberto\n" +"POT-Creation-Date: 2014-07-21 01:59+0200\n" +"PO-Revision-Date: 2014-08-06 21:00+0000\n" +"Last-Translator: johnholzer <johnholtzer123(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -347,7 +348,7 @@ msgstr "در هنگام شروع به کار I2P همه چیز به خوبی پ #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "error:" -msgstr "خطا" +msgstr "خطا :" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 @@ -415,32 +416,32 @@ msgstr "این ممکن است مدتی طول بکشد, بنابراین لطف msgid "Failed to setup chroot." msgstr "عدم موفقیت در راه اندازی Chroot" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "مرورگر نا امن" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "درحال بستن مرورگر نا امن" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "این ممکن است مدتی طول بکشد, و تا زمانی که به درستی خاموش شود لطفا مرورگر ناامن را ری استارت نکنید" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "عدم موفقیت در ری استارت کردن Tor" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "یک مرورگر نا امن دیگر درحال اجرا, یا در حال پاکسازی است. لطفا کمی دیرتر دوباره امتحان کنید." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 06 Aug '14

06 Aug '14

commit bcf5144a42c414b4ab9598ef955f52c7f70a3b24 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 6 21:15:41 2014 +0000 Update translations for tails-misc --- fa.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/fa.po b/fa.po index 7f6433f..63dec6d 100644 --- a/fa.po +++ b/fa.po @@ -8,14 +8,15 @@ # Danial Keshani <dani(a)daanial.com>, 2013 # Mohammad Hossein <desmati(a)gmail.com>, 2014 # Gilberto, 2014 +# johnholzer <johnholtzer123(a)gmail.com>, 2014 # Mohammad Hossein <desmati(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-08 19:08+0200\n" -"PO-Revision-Date: 2014-06-24 13:41+0000\n" -"Last-Translator: Gilberto\n" +"POT-Creation-Date: 2014-07-21 01:59+0200\n" +"PO-Revision-Date: 2014-08-06 21:00+0000\n" +"Last-Translator: johnholzer <johnholtzer123(a)gmail.com>\n" "Language-Team: Persian (http://www.transifex.com/projects/p/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -347,7 +348,7 @@ msgstr "در هنگام شروع به کار I2P همه چیز به خوبی پ #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:19 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:57 msgid "error:" -msgstr "خطا" +msgstr "خطا :" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:20 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:58 @@ -415,32 +416,32 @@ msgstr "این ممکن است مدتی طول بکشد, بنابراین لطف msgid "Failed to setup chroot." msgstr "عدم موفقیت در راه اندازی Chroot" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:175 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:182 #: ../config/chroot_local-includes/usr/share/applications/unsafe-browser.desktop.in.h:1 msgid "Unsafe Browser" msgstr "مرورگر نا امن" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:215 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:204 msgid "Shutting down the Unsafe Browser..." msgstr "درحال بستن مرورگر نا امن" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:216 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:205 msgid "" "This may take a while, and you may not restart the Unsafe Browser until it " "is properly shut down." msgstr "این ممکن است مدتی طول بکشد, و تا زمانی که به درستی خاموش شود لطفا مرورگر ناامن را ری استارت نکنید" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:228 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:217 msgid "Failed to restart Tor." msgstr "عدم موفقیت در ری استارت کردن Tor" -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:236 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:225 msgid "" "Another Unsafe Browser is currently running, or being cleaned up. Please " "retry in a while." msgstr "یک مرورگر نا امن دیگر درحال اجرا, یا در حال پاکسازی است. لطفا کمی دیرتر دوباره امتحان کنید." -#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:249 +#: config/chroot_local-includes/usr/local/sbin/unsafe-browser:238 msgid "" "No DNS server was obtained through DHCP or manually configured in " "NetworkManager."

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 06 Aug '14

06 Aug '14

commit 249f25c62c2ead43109f11b4e23926570fd997a3 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Aug 6 21:15:21 2014 +0000 Update translations for https_everywhere_completed --- fa/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa/https-everywhere.dtd b/fa/https-everywhere.dtd index 19a9144..187a874 100644 --- a/fa/https-everywhere.dtd +++ b/fa/https-everywhere.dtd @@ -3,7 +3,7 @@ <!ENTITY https-everywhere.about.ext_description "وب را رمزگذاری کنید! از امنیت HTTPS بصورت خودکار برای بسیاری از وب‌سایت‌ها استفاده کنید."> <!ENTITY https-everywhere.about.version "نسخه"> <!ENTITY https-everywhere.about.created_by "نوشته‌شده توسط"> -<!ENTITY https-everywhere.about.librarians "Ruleset Librarians"> +<!ENTITY https-everywhere.about.librarians "کتابداران قوانین"> <!ENTITY https-everywhere.about.thanks "با تشکر از"> <!ENTITY https-everywhere.about.contribute "اگر شما از HTTPS همه‌جا راضی هستید، پیشنهاد می‌کنیم"> <!ENTITY https-everywhere.about.donate_tor "به Tor کمک مالی کنید.">

1 0