- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Update FTE bridges to actual IPs+fingerprints.
by mikeperry＠torproject.org 14 Mar '14

14 Mar '14

commit 304ad7605db71d32bd06c2287cc32e65836cbb02 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 14 10:35:36 2014 -0700 Update FTE bridges to actual IPs+fingerprints. --- Bundle-Data/PTConfigs/bridge_prefs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index e3d6b69..9a3dfc2 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -12,4 +12,5 @@ pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:477 pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); -pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); +pref("extensions.torlauncher.default_bridge.fte.1", "fte 131.252.210.150:8080 271EC1874E40FE65C145C6397AA34FFF7008E50E"); +pref("extensions.torlauncher.default_bridge.fte.2", "fte 79.125.3.12:8080 17AF9F9F4E57614A060B7221DCCEDB8BB546DD73");

1 0

[tor-launcher/master] Bug #10418: Increase dialog height on Windows.
by brade＠torproject.org 13 Mar '14

13 Mar '14

commit 32ba7dee797e51199bbd214031fc264d5d515be9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 13 13:45:36 2014 -0400 Bug #10418: Increase dialog height on Windows. This is necessary so that the bridges help text can be displayed without a vertical scrollbar. --- src/chrome/skin/network-settings.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 4873ca8..b1f7f92 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -13,6 +13,7 @@ dialog { dialog.os-windows { width: 49em; + height: 42em; } wizard {

1 0

[tor-launcher/master] Bug #11180: Improve the "Use Bridges" UI.
by brade＠torproject.org 13 Mar '14

13 Mar '14

commit 7e006125569a58b4793c2950fb0a22d9b196a917 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 13 13:54:35 2014 -0400 Bug #11180: Improve the "Use Bridges" UI. When the provided/custom bridges radio buttons are changed, disable the labels and controls associated with the inactive radio button. Reduce vertical space between the "Connect with provided bridges" radio button and its associated "Transport type" menu. --- src/chrome/content/network-settings-overlay.xul | 32 ++++++++------- src/chrome/content/network-settings.js | 48 +++++++++++++++++------ 2 files changed, 53 insertions(+), 27 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 6a85be4..4172af5 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -75,29 +75,31 @@ <groupbox id="bridgeSpecificSettings"> <hbox pack="end"> - <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px"> - <radio id="bridgeRadioDefault" - label="&torsettings.useBridges.default;" selected="true" /> - <hbox align="baseline"> - <spacer style="width: 1.9em" /> - <label value="&torsettings.useBridges.type;" - control="defaultBridgeType" /> - <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> + <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px" + oncommand="onBridgeTypeRadioChange()"> + <radio id="bridgeRadioDefault" + label="&torsettings.useBridges.default;" selected="true" /> + <hbox align="baseline" style="margin-top: -5px"> + <spacer style="width: 1.9em" /> + <label id="defaultBridgeTypeLabel" + value="&torsettings.useBridges.type;" + control="defaultBridgeType"/> + <menulist id="defaultBridgeType"> <menupopup id="defaultBridgeType_menuPopup" /> - </menulist> - <spring/> - </hbox> + </menulist> + <spring/> + </hbox> <spacer style="height: 0.5em" /> <hbox align="baseline" flex="1"> - <radio align="start" id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" - oncommand="onCustomBridges()" /> + <radio align="start" id="bridgeRadioCustom" + label="&torsettings.useBridges.custom;" /> <button align="end" dlgtype="help" oncommand="onOpenHelp()" /> - </hbox> + </hbox> </radiogroup> </hbox> <vbox id="bridgeCustomEntry"> - <label style="margin-top:0px;" + <label id="bridgeListLabel" style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> <textbox id="bridgeList" multiline="true" rows="3" oninput="onCustomBridgesTextInput();" diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index de7259f..07526c8 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -249,14 +249,19 @@ function onCustomBridgesTextInput() var customBridges = document.getElementById(kCustomBridgesRadio); if (customBridges) customBridges.control.selectedItem = customBridges; + onBridgeTypeRadioChange(); } -function onCustomBridges() +function onBridgeTypeRadioChange() { - var bridgeList = document.getElementById(kBridgeList); - if (bridgeList) - bridgeList.focus(); + var useCustom = getElemValue(kCustomBridgesRadio, false); + enableElemWithLabel(kDefaultBridgeTypeMenuList, !useCustom); + enableElemWithLabel(kBridgeList + "Label", useCustom); + var focusElemID = (useCustom) ? kBridgeList : kDefaultBridgeTypeMenuList; + var elem = document.getElementById(focusElemID); + if (elem) + elem.focus(); } @@ -470,13 +475,14 @@ function setButtonAttr(aID, aAttr, aValue) } -function enableTextBox(aID, aEnable) +// Enables / disables aID as well as optional aID+"Label" element. +function enableElemWithLabel(aID, aEnable) { if (!aID) return; - var textbox = document.getElementById(aID); - if (textbox) + var elem = document.getElementById(aID); + if (elem) { var label = document.getElementById(aID + "Label"); if (aEnable) @@ -484,17 +490,34 @@ function enableTextBox(aID, aEnable) if (label) label.removeAttribute("disabled"); - textbox.removeAttribute("disabled"); - var s = textbox.getAttribute("origPlaceholder"); - if (s) - textbox.setAttribute("placeholder", s); + elem.removeAttribute("disabled"); } else { if (label) label.setAttribute("disabled", true); - textbox.setAttribute("disabled", true); + elem.setAttribute("disabled", true); + } + } +} + + +// Removes placeholder text when disabled. +function enableTextBox(aID, aEnable) +{ + enableElemWithLabel(aID, aEnable); + var textbox = document.getElementById(aID); + if (textbox) + { + if (aEnable) + { + var s = textbox.getAttribute("origPlaceholder"); + if (s) + textbox.setAttribute("placeholder", s); + } + else + { textbox.setAttribute("origPlaceholder", textbox.placeholder); textbox.removeAttribute("placeholder"); } @@ -804,6 +827,7 @@ function initBridgeSettings() var radio = document.getElementById(radioID); if (radio) radio.control.selectedItem = radio; + onBridgeTypeRadioChange(); return true; }

1 0

[tor-browser-bundle/master] Update and add additional Tor patch backports.
by mikeperry＠torproject.org 13 Mar '14

13 Mar '14

commit f8d4e17956f34936129e47e9865fb4919324e3a6 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Mar 12 20:53:34 2014 -0700 Update and add additional Tor patch backports. --- Bundle-Data/Docs/ChangeLog.txt | 2 + gitian/descriptors/linux/gitian-tor.yml | 6 +- gitian/descriptors/mac/gitian-tor.yml | 6 +- gitian/descriptors/windows/gitian-tor.yml | 6 +- gitian/patches/bug11069.patch | 164 ++++++++++++++++++----------- gitian/patches/bug11156.patch | 164 +++++++++++++++++++++++++++++ gitian/patches/bug5018.patch | 64 ++++++++--- gitian/patches/bug9229.patch | 46 ++++++++ 8 files changed, 376 insertions(+), 82 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index ccf31b0..b82ccd7 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -17,7 +17,9 @@ Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014 * Update Tor to 0.2.4.21 * Backport Pending Tor Patches: * Bug 5018: Don't launch Pluggable Transport helpers if not in use + * Bug 9229: Eliminate 60 second stall during bootstrap with some PTs * Bug 11069: Detect and report Pluggable Transport bootstrap failures + * Bug 11156: Prevent spurious warning about missing pluggable transports * Bug 10237: Disable the media cache to prevent disk leaks for videos * Bug 10703: Force the default charset to avoid locale fingerprinting * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index a83d8a4..f0cb682 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -26,6 +26,8 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.patch" - "dzip.sh" - "openssl.tar.gz" @@ -82,10 +84,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index 1596c8e..8b049b0 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,6 +27,8 @@ files: - "openssl.tar.gz" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.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" @@ -98,10 +100,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 9033939..3d05eaa 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -26,6 +26,8 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug9229.patch" +- "bug11156.patch" - "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" @@ -94,10 +96,12 @@ script: | git am ~/build/bug10297.patch fi if [ $BUILD_PT_BUNDLES ]; then - git am ~/build/bug11069.patch if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then + git am ~/build/bug9229.patch git am ~/build/bug5018.patch + git am ~/build/bug11069.patch + git am ~/build/bug11156.patch fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/patches/bug11069.patch b/gitian/patches/bug11069.patch index 563aafb..b6032e9 100644 --- a/gitian/patches/bug11069.patch +++ b/gitian/patches/bug11069.patch @@ -1,16 +1,24 @@ -From 404cc6095e31ce47af9287cdda1e4d3ff449b387 Mon Sep 17 00:00:00 2001 +From 67c70b2566fc9bef4527fb8a0c24ce7d8c4d0647 Mon Sep 17 00:00:00 2001 From: George Kadianakis <desnacked(a)riseup.net> -Date: Fri, 28 Feb 2014 15:19:30 +0000 -Subject: [PATCH] Throw control port warning if we failed connecting to briges. +Date: Mon, 10 Mar 2014 22:52:07 +0000 +Subject: [PATCH] Throw control port warning if we failed to connect to all our + bridges. +Conflicts: + src/or/connection.c + src/or/control.c + src/or/control.h + src/test/test_extorport.c --- - changes/bug11069 | 4 ++++ - src/or/connection.c | 41 ++++++++++++++++++++++++++++++++--------- - src/or/connection.h | 2 ++ - src/or/control.c | 7 ++++--- - src/or/entrynodes.c | 21 --------------------- - src/or/entrynodes.h | 1 - - 6 files changed, 42 insertions(+), 34 deletions(-) + changes/bug11069 | 4 ++++ + src/or/connection.c | 25 +++++++++++++++++++++++++ + src/or/connection.h | 2 ++ + src/or/connection_or.c | 8 +++++--- + src/or/control.c | 13 ++++++++----- + src/or/control.h | 3 ++- + src/or/entrynodes.c | 21 --------------------- + src/or/entrynodes.h | 1 - + 8 files changed, 46 insertions(+), 31 deletions(-) create mode 100644 changes/bug11069 diff --git a/changes/bug11069 b/changes/bug11069 @@ -24,57 +32,27 @@ index 0000000..5aa3085 + connect to all of our bridges. Fixes bug 11069; bugfix on + tor-0.2.1.2-alpha. diff --git a/src/or/connection.c b/src/or/connection.c -index 77565ee..12f2b01 100644 +index 4f74a1d..ba28d81 100644 --- a/src/or/connection.c +++ b/src/or/connection.c -@@ -3129,15 +3129,6 @@ connection_handle_read_impl(connection_t *conn) - before = buf_datalen(conn->inbuf); - if (connection_read_to_buf(conn, &max_to_read, &socket_error) < 0) { - /* There's a read error; kill the connection.*/ -- if (conn->type == CONN_TYPE_OR) { -- connection_or_notify_error(TO_OR_CONN(conn), -- socket_error != 0 ? -- errno_to_orconn_end_reason(socket_error) : -- END_OR_CONN_REASON_CONNRESET, -- socket_error != 0 ? -- tor_socket_strerror(socket_error) : -- "(unknown, errno was 0)"); -- } - if (CONN_IS_EDGE(conn)) { - edge_connection_t *edge_conn = TO_EDGE_CONN(conn); - connection_edge_end_errno(edge_conn); -@@ -3152,6 +3143,19 @@ connection_handle_read_impl(connection_t *conn) - * connection_or_notify_error() above. - */ - connection_mark_for_close_internal(conn); -+ -+ /* If it's an OR connection, notify the other components of its -+ failure. */ -+ if (conn->type == CONN_TYPE_OR) { -+ connection_or_notify_error(TO_OR_CONN(conn), -+ socket_error != 0 ? -+ errno_to_orconn_end_reason(socket_error) : -+ END_OR_CONN_REASON_CONNRESET, -+ socket_error != 0 ? -+ tor_socket_strerror(socket_error) : -+ "(unknown, errno was 0)"); -+ } -+ - return -1; - } - n_read += buf_datalen(conn->inbuf) - before; -@@ -4164,6 +4168,25 @@ connection_dir_get_by_purpose_and_resource(int purpose, +@@ -3846,6 +3846,31 @@ connection_get_by_type_purpose(int type, int purpose) return NULL; } -+/** Return 1 if there are any active OR connections. We use this to -+ * guess if we should tell the controller that we didn't manage to -+ * connect to any of our bridges. */ ++/** Return 1 if there are any active OR connections apart from ++ * this_conn. ++ * ++ * We use this to guess if we should tell the controller that we ++ * didn't manage to connect to any of our bridges. */ +int -+any_active_or_conns(void) ++any_other_active_or_conns(const or_connection_t *this_conn) +{ + smartlist_t *conns = get_connection_array(); + SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { ++ if (conn == TO_CONN(this_conn)) { /* don't consider this conn */ ++ continue; ++ } ++ + if (conn->type == CONN_TYPE_OR && + !conn->marked_for_close) { + log_debug(LD_DIR, "%s: Found an OR connection: %s", @@ -90,23 +68,71 @@ index 77565ee..12f2b01 100644 int connection_is_listener(connection_t *conn) diff --git a/src/or/connection.h b/src/or/connection.h -index fa07650..47c70c5 100644 +index c78fe6e..9bd5f88 100644 --- a/src/or/connection.h +++ b/src/or/connection.h -@@ -187,6 +187,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, +@@ -180,6 +180,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, dir_connection_t *connection_dir_get_by_purpose_and_resource( int state, const char *resource); -+int any_active_or_conns(void); ++int any_other_active_or_conns(const or_connection_t *this_conn); + #define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR) int connection_is_listener(connection_t *conn); int connection_state_is_open(connection_t *conn); +diff --git a/src/or/connection_or.c b/src/or/connection_or.c +index 8e7cd9e..8684f18 100644 +--- a/src/or/connection_or.c ++++ b/src/or/connection_or.c +@@ -645,7 +645,8 @@ connection_or_about_to_close(or_connection_t *or_conn) + reason); + if (!authdir_mode_tests_reachability(options)) + control_event_bootstrap_problem( +- orconn_end_reason_to_control_string(reason), reason); ++ orconn_end_reason_to_control_string(reason), ++ reason, or_conn); + } + } + } else if (conn->hold_open_until_flushed) { +@@ -1008,7 +1009,7 @@ connection_or_connect_failed(or_connection_t *conn, + { + control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED, reason); + if (!authdir_mode_tests_reachability(get_options())) +- control_event_bootstrap_problem(msg, reason); ++ control_event_bootstrap_problem(msg, reason, conn); + } + + /** conn got an error in connection_handle_read_impl() or +@@ -1638,7 +1639,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn, + if (!authdir_mode_tests_reachability(options)) + control_event_bootstrap_problem( + "Unexpected identity in router certificate", +- END_OR_CONN_REASON_OR_IDENTITY); ++ END_OR_CONN_REASON_OR_IDENTITY, ++ conn); + return -1; + } + if (authdir_mode_tests_reachability(options)) { diff --git a/src/or/control.c b/src/or/control.c -index 05ff9a6..198fb18 100644 +index a88de12..cd2c55c 100644 --- a/src/or/control.c +++ b/src/or/control.c -@@ -4898,9 +4898,10 @@ control_event_bootstrap_problem, (const char *warn, int reason)) +@@ -4696,10 +4696,12 @@ control_event_bootstrap(bootstrap_status_t status, int progress) + + /** Called when Tor has failed to make bootstrapping progress in a way + * that indicates a problem. warn gives a hint as to why, and +- * reason provides an "or_conn_end_reason" tag. ++ * reason provides an "or_conn_end_reason" tag. or_conn ++ * is the connection that caused this problem. + */ + void +-control_event_bootstrap_problem(const char *warn, int reason) ++control_event_bootstrap_problem(const char *warn, int reason, ++ const or_connection_t *or_conn) + { + int status = bootstrap_percent; + const char *tag, *summary; +@@ -4721,9 +4723,10 @@ control_event_bootstrap_problem(const char *warn, int reason) if (reason == END_OR_CONN_REASON_NO_ROUTE) recommendation = "warn"; @@ -116,15 +142,29 @@ index 05ff9a6..198fb18 100644 + /* If we are using bridges and all our OR connections are now + closed, it means that we totally failed to connect to our + bridges. Throw a warning. */ -+ if (get_options()->UseBridges && !any_active_or_conns()) ++ if (get_options()->UseBridges && !any_other_active_or_conns(or_conn)) recommendation = "warn"; if (we_are_hibernating()) +diff --git a/src/or/control.h b/src/or/control.h +index 61062da..1d90a90 100644 +--- a/src/or/control.h ++++ b/src/or/control.h +@@ -85,7 +85,8 @@ void enable_control_logging(void); + void monitor_owning_controller_process(const char *process_spec); + + void control_event_bootstrap(bootstrap_status_t status, int progress); +-void control_event_bootstrap_problem(const char *warn, int reason); ++void control_event_bootstrap_problem(const char *warn, int reason, ++ const or_connection_t *or_conn); + + void control_event_clients_seen(const char *controller_str); + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c -index d463303..17c5b13 100644 +index 2aa063c..b145c94 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c -@@ -2213,27 +2213,6 @@ any_bridge_descriptors_known(void) +@@ -2134,27 +2134,6 @@ any_bridge_descriptors_known(void) return choose_random_entry(NULL) != NULL; } @@ -153,10 +193,10 @@ index d463303..17c5b13 100644 * (bridge or member of EntryNodes) and all descriptors we know are * down. Else return 0. If act is 1, then mark the down guards diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h -index 772c666..73ac017 100644 +index 52b8dc0..f6c07d9 100644 --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h -@@ -105,7 +105,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); +@@ -104,7 +104,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); void fetch_bridge_descriptors(const or_options_t *options, time_t now); void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); int any_bridge_descriptors_known(void); diff --git a/gitian/patches/bug11156.patch b/gitian/patches/bug11156.patch new file mode 100644 index 0000000..ba6e266 --- /dev/null +++ b/gitian/patches/bug11156.patch @@ -0,0 +1,164 @@ +From af42f9b9125fb3f50f7383e63fb02bab1df82db9 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Wed, 12 Mar 2014 20:25:05 -0700 +Subject: [PATCH] Don't do directory fetches before all PTs have been + configured. + +--- + src/or/microdesc.c | 2 +- + src/or/networkstatus.c | 36 ++++++++++++++++++++++++++++++------ + src/or/networkstatus.h | 2 +- + src/or/nodelist.c | 8 ++++---- + src/or/routerlist.c | 6 +++--- + 5 files changed, 39 insertions(+), 15 deletions(-) + +diff --git a/src/or/microdesc.c b/src/or/microdesc.c +index 90ac0ac..1f12347 100644 +--- a/src/or/microdesc.c ++++ b/src/or/microdesc.c +@@ -725,7 +725,7 @@ update_microdesc_downloads(time_t now) + smartlist_t *missing; + digestmap_t *pending; + +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (directory_too_idle_to_fetch_descriptors(options, now)) + return; +diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c +index 1b5c6db..bcadc52 100644 +--- a/src/or/networkstatus.c ++++ b/src/or/networkstatus.c +@@ -31,6 +31,7 @@ + #include "router.h" + #include "routerlist.h" + #include "routerparse.h" ++#include "transports.h" + + /* For tracking v2 networkstatus documents. Only caches do this now. */ + +@@ -1380,14 +1381,37 @@ update_consensus_networkstatus_fetch_time(time_t now) + + /** Return 1 if there's a reason we shouldn't try any directory + * fetches yet (e.g. we demand bridges and none are yet known). +- * Else return 0. */ ++ * Else return 0. ++ ++ * If we return 1 and msg_out is provided, set msg_out ++ * to an explanation of why directory fetches are delayed. (If we ++ * return 0, we set msg_out to NULL.) ++ */ + int +-should_delay_dir_fetches(const or_options_t *options) ++should_delay_dir_fetches(const or_options_t *options, const char **msg_out) + { +- if (options->UseBridges && !any_bridge_descriptors_known()) { +- log_info(LD_DIR, "delaying dir fetches (no running bridges known)"); +- return 1; ++ if (msg_out) { ++ *msg_out = NULL; + } ++ ++ if (options->UseBridges) { ++ if (!any_bridge_descriptors_known()) { ++ if (msg_out) { ++ *msg_out = "No running bridges"; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (no running bridges known)"); ++ return 1; ++ } ++ ++ if (pt_proxies_configuration_pending()) { ++ if (msg_out) { ++ *msg_out = "Pluggable transport proxies still configuring"; ++ } ++ log_info(LD_DIR, "Delaying dir fetches (pt proxies still configuring)"); ++ return 1; ++ } ++ } ++ + return 0; + } + +@@ -1397,7 +1421,7 @@ void + update_networkstatus_downloads(time_t now) + { + const or_options_t *options = get_options(); +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (authdir_mode_any_main(options) || options->FetchV2Networkstatus) + update_v2_networkstatus_cache_downloads(now); +diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h +index 761f8e7..f50f6f1 100644 +--- a/src/or/networkstatus.h ++++ b/src/or/networkstatus.h +@@ -69,7 +69,7 @@ int networkstatus_nickname_is_unnamed(const char *nickname); + void networkstatus_consensus_download_failed(int status_code, + const char *flavname); + void update_consensus_networkstatus_fetch_time(time_t now); +-int should_delay_dir_fetches(const or_options_t *options); ++int should_delay_dir_fetches(const or_options_t *options,const char **msg_out); + void update_networkstatus_downloads(time_t now); + void update_certificate_downloads(time_t now); + int consensus_is_waiting_for_certs(void); +diff --git a/src/or/nodelist.c b/src/or/nodelist.c +index 178f084..600a1fd 100644 +--- a/src/or/nodelist.c ++++ b/src/or/nodelist.c +@@ -1439,6 +1439,7 @@ 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()) +@@ -1451,10 +1452,9 @@ update_router_have_minimum_dir_info(void) + goto done; + } + +- if (should_delay_dir_fetches(get_options())) { +- log_notice(LD_DIR, "no known bridge descriptors running yet; stalling"); +- strlcpy(dir_info_status, "No live bridge descriptors.", +- sizeof(dir_info_status)); ++ 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)); + res = 0; + goto done; + } +diff --git a/src/or/routerlist.c b/src/or/routerlist.c +index cb39729..d78c7bb 100644 +--- a/src/or/routerlist.c ++++ b/src/or/routerlist.c +@@ -684,7 +684,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now) + char id_digest_str[2*DIGEST_LEN+1]; + char sk_digest_str[2*DIGEST_LEN+1]; + +- if (should_delay_dir_fetches(get_options())) ++ if (should_delay_dir_fetches(get_options(), NULL)) + return; + + pending_cert = fp_pair_map_new(); +@@ -4901,7 +4901,7 @@ void + update_router_descriptor_downloads(time_t now) + { + const or_options_t *options = get_options(); +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (!we_fetch_router_descriptors(options)) + return; +@@ -4925,7 +4925,7 @@ update_extrainfo_downloads(time_t now) + int n_no_ei = 0, n_pending = 0, n_have = 0, n_delay = 0; + if (! options->DownloadExtraInfo) + return; +- if (should_delay_dir_fetches(options)) ++ if (should_delay_dir_fetches(options, NULL)) + return; + if (!router_have_minimum_dir_info()) + return; +-- +1.8.1.2 + diff --git a/gitian/patches/bug5018.patch b/gitian/patches/bug5018.patch index 4784027..b0ac8e6 100644 --- a/gitian/patches/bug5018.patch +++ b/gitian/patches/bug5018.patch @@ -1,14 +1,14 @@ -From e967595b931c92650250cc385ef7f6aeabd887f5 Mon Sep 17 00:00:00 2001 +From 3394daa34842a397561e65002a33c13355df651d Mon Sep 17 00:00:00 2001 From: George Kadianakis <desnacked(a)riseup.net> Date: Thu, 28 Feb 2013 18:58:36 +0200 -Subject: [PATCH 1/3] Only launch transport proxies that provide useful +Subject: [PATCH 1/4] Only launch transport proxies that provide useful transports. --- - changes/bug5018 | 3 +++ - src/or/config.c | 20 ++++++++++++++++---- - src/or/entrynodes.c | 23 +++++++++++++++++++++++ - src/or/entrynodes.h | 1 + + changes/bug5018 | 3 +++ + src/or/config.c | 20 ++++++++++++++++---- + src/or/entrynodes.c | 23 +++++++++++++++++++++++ + src/or/entrynodes.h | 1 + 4 files changed, 43 insertions(+), 4 deletions(-) create mode 100644 changes/bug5018 @@ -22,7 +22,7 @@ index 0000000..c5c12ef + - Don't launch pluggable transport proxies that contribute + transports we don't need. Resolves ticket 5018. diff --git a/src/or/config.c b/src/or/config.c -index 3984755..5f905d5 100644 +index ef02946..47510c5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4242,7 +4242,8 @@ parse_client_transport_line(const char *line, int validate_only) @@ -118,17 +118,17 @@ index 52b8dc0..b02cd48 100644 double pathbias_get_close_success_count(entry_guard_t *guard); -- -1.7.9.5 +1.8.1.2 -From d222f04e3a4093efc7be19f43def04d9c0704653 Mon Sep 17 00:00:00 2001 +From 54f75531a9613ee7b964be93b0051bc75322e7e3 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> Date: Sat, 26 Oct 2013 14:34:48 -0700 -Subject: [PATCH 2/3] Simplify transport_is_needed. +Subject: [PATCH 2/4] Simplify transport_is_needed. By Roger at https://trac.torproject.org/projects/tor/ticket/5018#comment:11. --- - src/or/entrynodes.c | 14 ++++---------- + src/or/entrynodes.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c @@ -163,21 +163,21 @@ index 4062cee..98a01c5 100644 /** Remember a new bridge at addr:port. If digest -- -1.7.9.5 +1.8.1.2 -From c1e396e66773813e051e8c96df86b585031a833b Mon Sep 17 00:00:00 2001 +From 936ff64974b00a898fa0e77e3fd6f9b2df57f448 Mon Sep 17 00:00:00 2001 From: David Fifield <david(a)bamsoftware.com> Date: Sat, 26 Oct 2013 14:37:50 -0700 -Subject: [PATCH 3/3] Document that unneeded transports are ignored. +Subject: [PATCH 3/4] Document that unneeded transports are ignored. Suggested by Roger in https://trac.torproject.org/projects/tor/ticket/5018#comment:11. --- - src/or/config.c | 3 ++- + src/or/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c -index 5f905d5..3ae0216 100644 +index 47510c5..435d981 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4220,7 +4220,8 @@ parse_bridge_line(const char *line, int validate_only) @@ -191,5 +191,35 @@ index 5f905d5..3ae0216 100644 * our internal transport list. * - If it's a managed proxy line, launch the managed proxy. */ -- -1.7.9.5 +1.8.1.2 + +From a4cf8514af1d2dbfd15857af83076577b7dcc4ee Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Mon, 10 Mar 2014 22:05:31 +0000 +Subject: [PATCH 4/4] Tone down the log message for when we don't need a PT + proxy. + +Conflicts: + changes/bug5018 +--- + src/or/config.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/or/config.c b/src/or/config.c +index 435d981..914c3de 100644 +--- a/src/or/config.c ++++ b/src/or/config.c +@@ -4295,8 +4295,8 @@ parse_client_transport_line(const char *line, int validate_only) + + if (is_managed) { /* managed */ + if (!validate_only && is_useless_proxy) { +- log_warn(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " +- "any needed transports and will not be launched.", line); ++ log_notice(LD_GENERAL, "Pluggable transport proxy (%s) does not provide " ++ "any needed transports and will not be launched.", line); + } + + /* If we are not just validating, use the rest of the line as the +-- +1.8.1.2 diff --git a/gitian/patches/bug9229.patch b/gitian/patches/bug9229.patch new file mode 100644 index 0000000..6b1115c --- /dev/null +++ b/gitian/patches/bug9229.patch @@ -0,0 +1,46 @@ +From db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Mon Sep 17 00:00:00 2001 +From: Nick Mathewson <nickm(a)torproject.org> +Date: Mon, 10 Mar 2014 15:01:27 -0400 +Subject: [PATCH] Update ns downloads when we receive a bridge descriptor + +This prevents long stalls when we're starting with a state file but +with no bridge descriptors. Fixes bug 9229. I believe this bug has +been present since 0.2.0.3-alpha. +--- + changes/bug9229 | 5 +++++ + src/or/entrynodes.c | 6 +++++- + 2 files changed, 10 insertions(+), 1 deletion(-) + create mode 100644 changes/bug9229 + +diff --git a/changes/bug9229 b/changes/bug9229 +new file mode 100644 +index 0000000..ad7fd22 +--- /dev/null ++++ b/changes/bug9229 +@@ -0,0 +1,5 @@ ++ o Minor bugfixes: ++ - Avoid 60-second delays in the bootstrapping process when Tor ++ is launching for a second time while using bridges. Fixes bug 9229; ++ bugfix on 0.2.0.3-alpha. ++ +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index 2aa063c..59770fa 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) + * our entry node list */ + entry_guard_register_connect_status(ri->cache_info.identity_digest, + 1, 0, now); +- if (first) ++ if (first) { ++ /* XXXX apparently, this is never called. See bug #9229. */ + routerlist_retry_directory_downloads(now); ++ } ++ ++ update_networkstatus_downloads(now); + } + } + } +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Install argparse in windows pluggable-transports.
by mikeperry＠torproject.org 13 Mar '14

13 Mar '14

commit e68a2db0e6753f3d1d6839c17b88ba987c1c8f14 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Mar 2 04:25:52 2014 +0000 Install argparse in windows pluggable-transports. coderman on IRC noticed that the building of obfsproxy in the windows pluggable transports descriptor was downloading argparse: Processing dependencies for obfsproxy==unknown Searching for argparse Reading https://pypi.python.org/simple/argparse/ Application tried to create a window, but no driver could be loaded. Make sure that your X server is running and that $DISPLAY is set correctly. err:systray:initialize_systray Could not create tray window fixme:toolhelp:CreateToolhelp32Snapshot Unimplemented: heap list snapshot fixme:toolhelp:Heap32ListFirst : stub Best match: argparse 1.2.1 Downloading http://argparse.googlecode.com/files/argparse-1.2.1.tar.gz#md5=2fbef8cb61e5… Processing argparse-1.2.1.tar.gz argparse was already being installed in the linux and mac descriptors. It was not needed in the windows descriptor, because the windows build uses Python 2.7, and Python 2.7 has argparse in the standard library; and the "py2exe" target was able to find the standard module. However commit 8f8a4cd59bfe07e5b8c12e3990627544d9caeab4 changed obfsproxy to additionally call the "install" target (so that fteproxy could use obfsproxy), and apparently "install" can't find argparse. (Maybe because it's a .py file instead of a directory or an egg?) --- gitian/descriptors/windows/gitian-pluggable-transports.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 48efba5..9b0e8ec 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -31,6 +31,7 @@ files: - "gmp.tar.bz2" - "setuptools.tar.gz" - "pycrypto.tar.gz" +- "argparse.tar.gz" - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" @@ -156,6 +157,12 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install cd .. # + tar xzf argparse.tar.gz + cd argparse-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # unzip zope.interface.zip cd zope.interface-* find -type f | xargs touch --date="$REFERENCE_DATETIME"

1 0

[tor-launcher/master] Remove passive voice from progress bar description.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit 37adb31f73235869a278d84249087983fedb6575 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 11 15:09:14 2014 -0700 Remove passive voice from progress bar description. Also make it less confusing. We're making just "a" connection, not a new "network connection" or virtual network interface. --- src/chrome/locale/en/progress.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index f4395cf..ebd9cef 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "Please wait while a connection to the Tor network is established."> +<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.">

1 0

[tor-launcher/master] Bug #10418: Increase dialog height; fix typo.
by brade＠torproject.org 11 Mar '14

11 Mar '14

commit 60c933d5e260303a32df3417332357c2950f439b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Mar 11 15:36:14 2014 -0400 Bug #10418: Increase dialog height; fix typo. --- src/chrome/content/network-settings-overlay.xul | 2 +- src/chrome/skin/network-settings.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index dc88655..6a85be4 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -81,7 +81,7 @@ <hbox align="baseline"> <spacer style="width: 1.9em" /> <label value="&torsettings.useBridges.type;" - control="firewallAllowedPorts"/> + control="defaultBridgeType" /> <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> <menupopup id="defaultBridgeType_menuPopup" /> </menulist> diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index d34adcf..4873ca8 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -7,7 +7,7 @@ dialog { width: 45em; - height: 39em; + height: 41em; font: -moz-dialog; } @@ -17,7 +17,7 @@ dialog.os-windows { wizard { width: 43em; - height: 33em; + height: 34em; font: -moz-dialog; padding-top: 0px; }

1 0

[tor-launcher/master] Generalize Tor Browser strings to be independent of app.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit a634ce616ddc88745c9da0447e055e693ca8523c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 11 11:07:37 2014 -0700 Generalize Tor Browser strings to be independent of app. We want to allow Tor Launcher to work in Tor Browser, Tails, Thunderbird, and Instantbird with minimal modifications. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/en/progress.dtd | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index a779d9a..a346274 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,8 +1,8 @@ -<!ENTITY torsettings.dialog.title "Tor Browser Network Settings"> +<!ENTITY torsettings.dialog.title "Tor Network Settings">  -<!ENTITY torsettings.prompt "Before the Tor Browser tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Before you connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> <!ENTITY torSettings.no "No"> diff --git a/src/chrome/locale/en/progress.dtd b/src/chrome/locale/en/progress.dtd index 16491f9..f4395cf 100644 --- a/src/chrome/locale/en/progress.dtd +++ b/src/chrome/locale/en/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "Tor Status"> <!ENTITY torprogress.openSettings "Open Settings"> <!ENTITY torprogress.heading "Connecting to the Tor network"> -<!ENTITY torprogress.pleaseWait "The Tor Browser will open after a Tor network connection is established."> +<!ENTITY torprogress.pleaseWait "Please wait while a connection to the Tor network is established.">

1 0

[tor-launcher/master] Change "default bridges" to "provided bridges" everywhere.
by mikeperry＠torproject.org 11 Mar '14

11 Mar '14

commit 280646446dd3844185d30d1f9586070af19ff95f Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 10 23:18:32 2014 -0700 Change "default bridges" to "provided bridges" everywhere. Sorry translation team, but it is better to do this now than later. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- src/chrome/locale/en/torlauncher.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 62afab4..a779d9a 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -24,7 +24,7 @@ <!ENTITY torSettings.enterFirewall "Enter a comma-separated list of ports that are allowed by the firewall."> <!ENTITY torSettings.bridgeQuestion "Does your Internet Service Provider (ISP) block or otherwise censor connections to the Tor Network?"> <!ENTITY torSettings.bridgeHelp "If you are not sure how to answer this question, choose No.  If you choose Yes, you will be asked to configure Tor Bridges, which are unlisted relays that make it more difficult to block connections to the Tor Network."> -<!ENTITY torSettings.bridgeSettingsPrompt "You may use the default set of bridges or you may obtain and enter a custom set of bridges."> +<!ENTITY torSettings.bridgeSettingsPrompt "You may use the provided set of bridges or you may obtain and enter a custom set of bridges.">  @@ -55,7 +55,7 @@ <!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> <!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> <!ENTITY torsettings.bridgeHelp1 "If you are unable to connect to the Tor network, it could be that your Internet Service Provider (ISP) or another agency is blocking Tor.  Often, you can work around this problem by using Tor Bridges, which are unlisted relays that are more difficult to block."> -<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, default set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> +<!ENTITY torsettings.bridgeHelp1B "You may use the preconfigured, provided set of bridge addresses or you may obtain a custom set of addresses by using one of these three methods:"> <!ENTITY torsettings.bridgeHelp2Heading "Through the Web"> <!ENTITY torsettings.bridgeHelp2 "Use a web browser to visit https://bridges.torproject.org"> <!ENTITY torsettings.bridgeHelp3Heading "Through the Email Autoresponder"> diff --git a/src/chrome/locale/en/torlauncher.properties b/src/chrome/locale/en/torlauncher.properties index 38d314a..a2550db 100644 --- a/src/chrome/locale/en/torlauncher.properties +++ b/src/chrome/locale/en/torlauncher.properties @@ -24,8 +24,8 @@ torlauncher.ensure_tor_is_running=Please ensure that Tor is running. torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. torlauncher.error_proxy_type_missing=You must select the proxy type. torlauncher.error_bridges_missing=You must specify one or more bridges. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the default bridges. -torlauncher.error_bridge_bad_default_type=No default bridges that have the transport type %S are available. Please adjust your settings. +torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. +torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. torlauncher.recommended_bridge=(recommended)

1 0

[tor-launcher/master] Bug 10418: Improve layout and strings
by mikeperry＠torproject.org 10 Mar '14

10 Mar '14

commit 8748fdb1006a811eb5864be36108be4f2b5d0a8a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 10 16:27:11 2014 -0700 Bug 10418: Improve layout and strings The layout may still need some work, but at least these strings are in better shape in terms of usability and future changes like #11071. --- src/chrome/content/network-settings-overlay.xul | 23 +++++++++++++---------- src/chrome/locale/en/network-settings.dtd | 9 +++++---- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 29c3bb3..dc88655 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -76,25 +76,28 @@ <groupbox id="bridgeSpecificSettings"> <hbox pack="end"> <radiogroup id="bridgeTypeRadioGroup" flex="1" style="margin: 0px"> - <hbox align="center"> <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" /> - <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> + <hbox align="baseline"> + <spacer style="width: 1.9em" /> + <label value="&torsettings.useBridges.type;" + control="firewallAllowedPorts"/> + <menulist id="defaultBridgeType" oncommand="onBridgeTypeChange()"> <menupopup id="defaultBridgeType_menuPopup" /> - </menulist> - <spring/> - </hbox> + </menulist> + <spring/> + </hbox> <spacer style="height: 0.5em" /> - <radio id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" + <hbox align="baseline" flex="1"> + <radio align="start" id="bridgeRadioCustom" label="&torsettings.useBridges.custom;" oncommand="onCustomBridges()" /> + <button align="end" dlgtype="help" oncommand="onOpenHelp()" /> + </hbox> </radiogroup> - <vbox pack="start"> - <button dlgtype="help" oncommand="onOpenHelp()" /> - </vbox> </hbox> <vbox id="bridgeCustomEntry"> - <label style="margin-top:0px;" + <label style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> <textbox id="bridgeList" multiline="true" rows="3" oninput="onCustomBridgesTextInput();" diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index 4e21541..62afab4 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -1,8 +1,8 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> +<!ENTITY torsettings.dialog.title "Tor Browser Network Settings">  -<!ENTITY torsettings.prompt "Before the Tor Browser Bundle tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> +<!ENTITY torsettings.prompt "Before the Tor Browser tries to connect to the Tor network, you need to provide information about this computer's Internet connection."> <!ENTITY torSettings.yes "Yes"> <!ENTITY torSettings.no "No"> @@ -46,8 +46,9 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Use default bridges of type"> -<!ENTITY torsettings.useBridges.custom "Use custom bridges"> +<!ENTITY torsettings.useBridges.default "Connect with provided bridges"> +<!ENTITY torsettings.useBridges.type "Transport type:"> +<!ENTITY torsettings.useBridges.custom "Enter custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port">

1 0

[tor-launcher/master] Bug #10418: Use Sentence case for radio button labels.
by brade＠torproject.org 10 Mar '14

10 Mar '14

commit 848d698d8c832a88c5c0bc26d87a786cf6f4b6c1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Mar 10 14:35:59 2014 -0400 Bug #10418: Use Sentence case for radio button labels. --- src/chrome/locale/en/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/chrome/locale/en/network-settings.dtd b/src/chrome/locale/en/network-settings.dtd index dca8d53..4e21541 100644 --- a/src/chrome/locale/en/network-settings.dtd +++ b/src/chrome/locale/en/network-settings.dtd @@ -46,8 +46,8 @@ <!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> <!ENTITY torsettings.firewall.allowedPorts "Allowed Ports:"> <!ENTITY torsettings.useBridges.checkbox "My Internet Service Provider (ISP) blocks connections to the Tor network"> -<!ENTITY torsettings.useBridges.default "Use Default Bridges of Type"> -<!ENTITY torsettings.useBridges.custom "Use Custom Bridges"> +<!ENTITY torsettings.useBridges.default "Use default bridges of type"> +<!ENTITY torsettings.useBridges.custom "Use custom bridges"> <!ENTITY torsettings.useBridges.label "Enter one or more bridge relays (one per line)."> <!ENTITY torsettings.useBridges.placeholder "type address:port">

1 0

[tor-browser-bundle/master] Bug 4261: Fix DMG permissions to work from /Applications
by mikeperry＠torproject.org 08 Mar '14

08 Mar '14

commit fb9453c51306ad39d261617e2cb3ba8e18368574 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sat Mar 8 13:46:23 2014 -0800 Bug 4261: Fix DMG permissions to work from /Applications Only seems to matter on some Mac versions... Very odd. --- gitian/build-helpers/ddmg.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index 468d6be..c37a1fd 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,14 +5,17 @@ export LC_ALL=C DMGFILE=$1 shift -find $@ -executable -exec chmod 700 {} \; -find $@ ! -executable -exec chmod 600 {} \; +# We need group readability for some Macs to be able to handle /Applications +# installation. Still unclear exactly why this is -- it is not dependent on +# OSX version... +find $@ -executable -exec chmod 750 {} \; +find $@ ! -executable -exec chmod 640 {} \; cd $@ find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt -mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -dir-mode 0700 -new-dir-mode 0700 +mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -gid 20 -dir-mode 0750 -new-dir-mode 0750 cd ~/build

1 0

[tor-browser-bundle/master] Add a changelog entry for 3.6-beta-1.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f0fa0845fd19cdba5c1cdc2751d1fbe4e682684e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:27:25 2014 -0800 Add a changelog entry for 3.6-beta-1. --- Bundle-Data/Docs/ChangeLog.txt | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 657db38..ccf31b0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,33 @@ +Tor Browser Bundle 3.6-beta-1 -- Mar 12 2014 + * All Platforms + * Include Pluggable Transports by default: + * Obfsproxy3 0.2.4, Flashproxy 1.6, and FTE 0.2.6 are now included + * Update Tor Launcher to 0.2.5.0 + * Bug 10418: Provide UI configuration for Pluggable Transports + * Bug 10604: Allow Tor status & error messages to be translated + * Bug 10894: Make bridge UI clear that helpdesk is a last resort for + bridges + * Bug 10610: Clarify wizard UI text describing obstacles/blocking + * Bug 11074: Support Tails use case (XULRunner and optional + customizations) + * Update Torbutton to 1.6.7.0: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + * Update NoScript to 2.6.8.17 + * Update Tor to 0.2.4.21 + * Backport Pending Tor Patches: + * Bug 5018: Don't launch Pluggable Transport helpers if not in use + * Bug 11069: Detect and report Pluggable Transport bootstrap failures + * Bug 10237: Disable the media cache to prevent disk leaks for videos + * Bug 10703: Force the default charset to avoid locale fingerprinting + * Bug 10104: Update gitian to fix LXC build issues (for non-KVM/VT builders) + * Mac: + * Bug 4271: Use DMG instead of ZIP for Mac packages + * Linux: + * Bug 9533: Fix keyboard input on Ubuntu 13.10 + * Bug 9896: Provide debug symbols for Tor Browser binary + * Bug 10472: Pass arguments to the browser from Linux startup script + Tor Browser Bundle 3.5.2.1 -- Feb 14 2014 * All Platforms * Bug 10895: Fix broken localized bundles

1 0

[tor-browser-bundle/master] Update tags for Torbutton and Tor Browser.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit ffd28013c92b64a73ba985b708f47aa30e450063 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:52:06 2014 -0800 Update tags for Torbutton and Tor Browser. --- gitian/versions | 6 +++--- gitian/versions.alpha | 4 ++-- gitian/versions.beta | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gitian/versions b/gitian/versions index 7f367a0..4f1d1c8 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,12 +1,12 @@ -TORBROWSER_VERSION=3.5.2.1 +TORBROWSER_VERSION=3.5.3 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 76182b7..83febef 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -4,10 +4,10 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.0 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 diff --git a/gitian/versions.beta b/gitian/versions.beta index 94ada7c..fd4a715 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -4,10 +4,10 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 -TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 +TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-4-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.0 -TORBUTTON_TAG=1.6.6.0 +TORBUTTON_TAG=1.6.7.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8

1 0

[tor-launcher/master] Bugs 10867, 10900: Bug Add eu, sv, and ja to extra locales
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f9759b66e964c05188b9bd0adced5e06c005f09d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 13 16:55:37 2014 +0000 Bugs 10867,10900: Bug Add eu, sv, and ja to extra locales I swear I committed eu and ja before as bug #10687.. --- localization/import-translations.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/localization/import-translations.sh b/localization/import-translations.sh index 3096168..8d30a7d 100755 --- a/localization/import-translations.sh +++ b/localization/import-translations.sh @@ -1,6 +1,13 @@ #!/bin/sh -BUNDLE_LOCALES="ar de es fa fr it ja ko nl pl pt ru vi zh-CN" +BUNDLE_LOCALES="ar de es fa fr it ko nl pl pt ru vi zh-CN" + +# XXX: Basque (eu) by request in #10687. +# This is not used for official builds, but should remain +# so Basque XPIs can be build independently. We can do +# this for other languages too, if anyone requests this +# and translations are available. +BUNDLE_LOCALES="$BUNDLE_LOCALES eu ja sv" if [ -d translation ]; then

1 0

[torbutton/master] Changelog and version bump for 1.6.7.0.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 4a9d180fc8b97f38c51089a85305da2d6765eb15 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 14:48:54 2014 -0800 Changelog and version bump for 1.6.7.0. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index acbc736..321e2b9 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.6.7.0: + 7 Mar 2014: + * Bug 9901: Fix browser freeze due to content type sniffing + * Bug 10611: Add Swedish (sv) to extra locales to update + 1.6.6.0: 3 Feb 2014 * Bug #10800: Prevent exception in New Identity diff --git a/src/install.rdf b/src/install.rdf index e183f91..0c8c486 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.6.0</em:version> + <em:version>1.6.7.0</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser-bundle/master] Properly check the Tor tag before applying backport patches.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 2edf15136f5bbc939b4420537b779ab80a8c955c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 11:28:41 2014 -0800 Properly check the Tor tag before applying backport patches. Also only aply #5018 for PT-enabled bundles. --- gitian/descriptors/linux/gitian-tor.yml | 7 +++++-- gitian/descriptors/mac/gitian-tor.yml | 7 +++++-- gitian/descriptors/windows/gitian-tor.yml | 8 +++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index 8a50ed4..a83d8a4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -77,13 +77,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index d2aab2f..1596c8e 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -93,13 +93,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 00b1f9a..9033939 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -89,14 +89,16 @@ script: | export GIT_COMMITTER_NAME="nobody" export GIT_COMMITTER_EMAIL="nobody@localhost" export GIT_COMMITTER_DATE="$REFERENCE_DATETIME" - if [ ${TOR_TAG:9} == "tor-0.2.4" ]; + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; then git am ~/build/bug10297.patch - git am ~/build/bug5018.patch fi if [ $BUILD_PT_BUNDLES ]; then git am ~/build/bug11069.patch - fi + if [ ${TOR_TAG::9} == "tor-0.2.4" ]; + then + git am ~/build/bug5018.patch + fi fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh

1 0

[tor-browser-bundle/master] Bump versions for NoScript and for Tor.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f5484a13da65bf9138f2566326e9624178a376ed Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Mar 7 11:47:44 2014 -0800 Bump versions for NoScript and for Tor. --- gitian/versions | 6 +++--- gitian/versions.alpha | 6 +++--- gitian/versions.beta | 6 +++--- gitian/versions.nightly | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/gitian/versions b/gitian/versions index f0e8c42..7f367a0 100755 --- a/gitian/versions +++ b/gitian/versions @@ -4,7 +4,7 @@ BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.4.20 +TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -37,7 +37,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -61,7 +61,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.alpha b/gitian/versions.alpha index d6838dc..76182b7 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,7 +5,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.5.1-alpha +TOR_TAG=tor-0.2.5.2-alpha TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.beta b/gitian/versions.beta index 402b8a9..94ada7c 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -5,7 +5,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 -TOR_TAG=tor-0.2.4.20 +TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 8a2924a..baefbae 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -38,7 +38,7 @@ SETUPTOOLS_VER=1.4 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.17-fx+sm+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb @@ -62,7 +62,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 +NOSCRIPT_HASH=8d3246153054c92f850ea8a85b19a2e493a17979751087e4c7bf11f4056282f1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/master] Bug 10369: For now, at least download+verify the old OSX compiler.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit f1a4621f0c453b0f32752b940271aaa1cf4af8fc Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 6 23:20:20 2014 -0800 Bug 10369: For now, at least download+verify the old OSX compiler. We still need it for Tor and Pluggable Transports. --- gitian/fetch-inputs.sh | 4 ++-- gitian/versions | 3 +++ gitian/versions.alpha | 3 +++ gitian/versions.beta | 3 +++ gitian/versions.nightly | 3 +++ 5 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index c2bf811..0bc217e 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -151,7 +151,7 @@ do fi done -for i in TOOLCHAIN4 OSXSDK MSVCR100 +for i in TOOLCHAIN4 TOOLCHAIN4_OLD OSXSDK MSVCR100 do PACKAGE="${i}_PACKAGE" URL="${MIRROR_URL}${!PACKAGE}" @@ -217,7 +217,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT MINGW MSVCR100 PYCRYPTO ARGPARSE ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions b/gitian/versions index 11eb1db..f0e8c42 100755 --- a/gitian/versions +++ b/gitian/versions @@ -39,6 +39,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -59,6 +60,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -74,6 +76,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 85ffd95..d6838dc 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.beta b/gitian/versions.beta index a2c91b9..402b8a9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.13-fn+sm+fx.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 3288c7e..8a2924a 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -40,6 +40,7 @@ OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 NOSCRIPT_PACKAGE=noscript_security_suite-2.6.8.14-sm+fx+fn.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz +TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb MINGW_PACKAGE=mingw-w64-svn-snapshot.zip MSVCR100_PACKAGE=msvcr100.dll @@ -60,6 +61,7 @@ OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 +TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 NOSCRIPT_HASH=c0c089f994c71a8e504fa26fed9fbbb16dbd7e49d4bef2cf9bc6a2159ae5f073 MINGW_HASH=a5b03d0448a309341be4cf34c6ad3016d04c89952dca5243254b4d6c738b164f MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 @@ -75,6 +77,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} GMP_URL=https://ftp.gnu.org/gnu/gmp/${GMP_PACKAGE} TOOLCHAIN4_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${T… +TOOLCHAIN4_OLD_URL=https://people.torproject.org/~mikeperry/mirrors/sources/${TOOLCHAIN4_OLD_PACKAGE} OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE} GCC_URL=https://ftp.gnu.org/gnu/gcc/gcc-${GCC_VER}/${GCC_PACKAGE}

1 0

[tor-browser-bundle/master] Bug 4261: Make uncompressed DMG creation reproducible.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 82f061f118519c318ddf0aaa7dc4fcbd8290536e Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 14:21:30 2014 -0800 Bug 4261: Make uncompressed DMG creation reproducible. genisoimage was non-deterministic, and libdmg was using unitialized memory in a stack struct. --- gitian/build-helpers/ddmg.sh | 25 +++++++------------ gitian/descriptors/mac/gitian-bundle.yml | 6 +++++ gitian/patches/libdmg.patch | 39 ++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/gitian/build-helpers/ddmg.sh b/gitian/build-helpers/ddmg.sh index f9f54da..468d6be 100755 --- a/gitian/build-helpers/ddmg.sh +++ b/gitian/build-helpers/ddmg.sh @@ -5,24 +5,17 @@ export LC_ALL=C DMGFILE=$1 shift -# Attempt to normalize inode ordering.. -# XXX: the genisoimage -path-list argument seems broken -mkdir -p ~/build/tmp/dmg +find $@ -executable -exec chmod 700 {} \; +find $@ ! -executable -exec chmod 600 {} \; + cd $@ -for i in `find . | sort` -do - if [ -d $i ]; - then - mkdir -p ~/build/tmp/dmg/$i - else - cp --parents -d --preserve=all $i ~/build/tmp/dmg/ - fi -done +find . -type f | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" > ~/build/filelist.txt +find . -type l | sed -e 's/^\.\///' | sort | xargs -i echo "{}={}" >> ~/build/filelist.txt + +mkisofs -D -V "Tor Browser" -no-pad -R -apple -o ~/build/tbb-uncompressed.dmg -path-list ~/build/filelist.txt -graft-points -dir-mode 0700 -new-dir-mode 0700 -find ~/build/tmp/dmg -executable -exec chmod 700 {} \; -find ~/build/tmp/dmg ! -executable -exec chmod 600 {} \; +cd ~/build -genisoimage -D -V "Tor Browser" -no-pad -R -apple -o tbb-uncompressed.dmg ~/build/tmp/dmg/ ~/build/libdmg-hfsplus/dmg/dmg dmg tbb-uncompressed.dmg $DMGFILE rm tbb-uncompressed.dmg -rm -rf ~/build/tmp/dmg/ +rm ~/build/filelist.txt diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 63c0a96..55a6777 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -41,6 +41,7 @@ files: - "noscript(a)noscript.net.xpi" - "dzip.sh" - "ddmg.sh" +- "libdmg.patch" - "bare-version" - "bundle.inputs" - "versions" @@ -141,6 +142,7 @@ script: | # # Set up DMG skeleton cd libdmg-hfsplus + git am ~/build/libdmg.patch cmake CMakeLists.txt cd dmg make @@ -162,6 +164,10 @@ script: | ~/build/dzip.sh $OUTDIR/TorBrowserBundle-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.zip ${TORBROWSER_NAME}_en-US.app rm -rf ~/build/${TORBROWSER_NAME}_en-US.app else + # XXX: We need to insert these placeholders because otherwise mkisofs won't + # include these otherwise empty dirs: + touch ~/build/$TORBROWSER_NAME.app/Data/Browser/Caches/placeholder.txt + touch ~/build/$TORBROWSER_NAME.app/Contents/MacOS/TorBrowser.app/Contents/MacOS/browser/defaults/preferences/placeholder.txt cp -a ~/build/$TORBROWSER_NAME.app ~/build/dmg/$TORBROWSER_APP.app ~/build/ddmg.sh $OUTDIR/TorBrowser-${TORBROWSER_VERSION}-osx${GBUILD_BITS}_en-US.dmg ~/build/dmg rm -rf ~/build/dmg/$TORBROWSER_APP.app diff --git a/gitian/patches/libdmg.patch b/gitian/patches/libdmg.patch new file mode 100644 index 0000000..a84ac3e --- /dev/null +++ b/gitian/patches/libdmg.patch @@ -0,0 +1,39 @@ +From d1a5eca891f32103ccda80ee75e158dfc7ece70d Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)torproject.org> +Date: Thu, 6 Mar 2014 19:47:05 -0800 +Subject: [PATCH] Memset a UDIF header to ensure archive reproducibility. + +Some of the struct padding and fields contained unitialized memory, which +caused two successive invocations to produce archives that differed in some +bytes. +--- + dmg/dmglib.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/dmg/dmglib.c b/dmg/dmglib.c +index f481b1f..b74e50b 100644 +--- a/dmg/dmglib.c ++++ b/dmg/dmglib.c +@@ -108,7 +108,8 @@ int buildDmg(AbstractFile* abstractIn, AbstractFile* abstractOut) { + ChecksumToken dataForkToken; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + off_t plistOffset; + uint32_t plistSize; + uint32_t dataForkChecksum; +@@ -284,7 +285,8 @@ int convertToDMG(AbstractFile* abstractIn, AbstractFile* abstractOut) { + uint64_t numSectors; + + UDIFResourceFile koly; +- ++ memset(&koly, 0, sizeof(koly)); ++ + char partitionName[512]; + + off_t fileLength; +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Bug #11069: Detect PT bootstrap failures.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit bfb553da6b2d1978c369361950079297a8628fbf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Mar 6 17:05:04 2014 -0800 Bug #11069: Detect PT bootstrap failures. --- gitian/descriptors/linux/gitian-tor.yml | 4 + gitian/descriptors/mac/gitian-tor.yml | 4 + gitian/descriptors/windows/gitian-tor.yml | 4 + gitian/patches/bug11069.patch | 169 +++++++++++++++++++++++++++++ 4 files changed, 181 insertions(+) diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml index ce9372b..8a50ed4 100644 --- a/gitian/descriptors/linux/gitian-tor.yml +++ b/gitian/descriptors/linux/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "dzip.sh" - "openssl.tar.gz" script: | @@ -81,6 +82,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src #git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml index c2c2bf6..d2aab2f 100644 --- a/gitian/descriptors/mac/gitian-tor.yml +++ b/gitian/descriptors/mac/gitian-tor.yml @@ -27,6 +27,7 @@ files: - "openssl.tar.gz" - "bug10297.patch" - "bug5018.patch" +- "bug11069.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" - "dzip.sh" @@ -97,6 +98,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml index 6900a14..00b1f9a 100644 --- a/gitian/descriptors/windows/gitian-tor.yml +++ b/gitian/descriptors/windows/gitian-tor.yml @@ -26,6 +26,7 @@ files: - "versions" - "bug10297.patch" - "bug5018.patch" +- "bug11069.patch" - "binutils.tar.bz2" - "dzip.sh" - "openssl.tar.gz" @@ -93,6 +94,9 @@ script: | git am ~/build/bug10297.patch git am ~/build/bug5018.patch fi + if [ $BUILD_PT_BUNDLES ]; then + git am ~/build/bug11069.patch + fi mkdir -p $OUTDIR/src git archive HEAD | tar -x -C $OUTDIR/src ./autogen.sh diff --git a/gitian/patches/bug11069.patch b/gitian/patches/bug11069.patch new file mode 100644 index 0000000..563aafb --- /dev/null +++ b/gitian/patches/bug11069.patch @@ -0,0 +1,169 @@ +From 404cc6095e31ce47af9287cdda1e4d3ff449b387 Mon Sep 17 00:00:00 2001 +From: George Kadianakis <desnacked(a)riseup.net> +Date: Fri, 28 Feb 2014 15:19:30 +0000 +Subject: [PATCH] Throw control port warning if we failed connecting to briges. + +--- + changes/bug11069 | 4 ++++ + src/or/connection.c | 41 ++++++++++++++++++++++++++++++++--------- + src/or/connection.h | 2 ++ + src/or/control.c | 7 ++++--- + src/or/entrynodes.c | 21 --------------------- + src/or/entrynodes.h | 1 - + 6 files changed, 42 insertions(+), 34 deletions(-) + create mode 100644 changes/bug11069 + +diff --git a/changes/bug11069 b/changes/bug11069 +new file mode 100644 +index 0000000..5aa3085 +--- /dev/null ++++ b/changes/bug11069 +@@ -0,0 +1,4 @@ ++ o Minor bugfixes (clients): ++ - Fix tor so that it raises a control port warning when we fail to ++ connect to all of our bridges. Fixes bug 11069; bugfix on ++ tor-0.2.1.2-alpha. +diff --git a/src/or/connection.c b/src/or/connection.c +index 77565ee..12f2b01 100644 +--- a/src/or/connection.c ++++ b/src/or/connection.c +@@ -3129,15 +3129,6 @@ connection_handle_read_impl(connection_t *conn) + before = buf_datalen(conn->inbuf); + if (connection_read_to_buf(conn, &max_to_read, &socket_error) < 0) { + /* There's a read error; kill the connection.*/ +- if (conn->type == CONN_TYPE_OR) { +- connection_or_notify_error(TO_OR_CONN(conn), +- socket_error != 0 ? +- errno_to_orconn_end_reason(socket_error) : +- END_OR_CONN_REASON_CONNRESET, +- socket_error != 0 ? +- tor_socket_strerror(socket_error) : +- "(unknown, errno was 0)"); +- } + if (CONN_IS_EDGE(conn)) { + edge_connection_t *edge_conn = TO_EDGE_CONN(conn); + connection_edge_end_errno(edge_conn); +@@ -3152,6 +3143,19 @@ connection_handle_read_impl(connection_t *conn) + * connection_or_notify_error() above. + */ + connection_mark_for_close_internal(conn); ++ ++ /* If it's an OR connection, notify the other components of its ++ failure. */ ++ if (conn->type == CONN_TYPE_OR) { ++ connection_or_notify_error(TO_OR_CONN(conn), ++ socket_error != 0 ? ++ errno_to_orconn_end_reason(socket_error) : ++ END_OR_CONN_REASON_CONNRESET, ++ socket_error != 0 ? ++ tor_socket_strerror(socket_error) : ++ "(unknown, errno was 0)"); ++ } ++ + return -1; + } + n_read += buf_datalen(conn->inbuf) - before; +@@ -4164,6 +4168,25 @@ connection_dir_get_by_purpose_and_resource(int purpose, + return NULL; + } + ++/** Return 1 if there are any active OR connections. We use this to ++ * guess if we should tell the controller that we didn't manage to ++ * connect to any of our bridges. */ ++int ++any_active_or_conns(void) ++{ ++ smartlist_t *conns = get_connection_array(); ++ SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { ++ if (conn->type == CONN_TYPE_OR && ++ !conn->marked_for_close) { ++ log_debug(LD_DIR, "%s: Found an OR connection: %s", ++ __func__, conn->address); ++ return 1; ++ } ++ } SMARTLIST_FOREACH_END(conn); ++ ++ return 0; ++} ++ + /** Return 1 if conn is a listener conn, else return 0. */ + int + connection_is_listener(connection_t *conn) +diff --git a/src/or/connection.h b/src/or/connection.h +index fa07650..47c70c5 100644 +--- a/src/or/connection.h ++++ b/src/or/connection.h +@@ -187,6 +187,8 @@ connection_t *connection_get_by_type_state_rendquery(int type, int state, + dir_connection_t *connection_dir_get_by_purpose_and_resource( + int state, const char *resource); + ++int any_active_or_conns(void); ++ + #define connection_speaks_cells(conn) ((conn)->type == CONN_TYPE_OR) + int connection_is_listener(connection_t *conn); + int connection_state_is_open(connection_t *conn); +diff --git a/src/or/control.c b/src/or/control.c +index 05ff9a6..198fb18 100644 +--- a/src/or/control.c ++++ b/src/or/control.c +@@ -4898,9 +4898,10 @@ control_event_bootstrap_problem, (const char *warn, int reason)) + if (reason == END_OR_CONN_REASON_NO_ROUTE) + recommendation = "warn"; + +- if (get_options()->UseBridges && +- !any_bridge_descriptors_known() && +- !any_pending_bridge_descriptor_fetches()) ++ /* If we are using bridges and all our OR connections are now ++ closed, it means that we totally failed to connect to our ++ bridges. Throw a warning. */ ++ if (get_options()->UseBridges && !any_active_or_conns()) + recommendation = "warn"; + + if (we_are_hibernating()) +diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c +index d463303..17c5b13 100644 +--- a/src/or/entrynodes.c ++++ b/src/or/entrynodes.c +@@ -2213,27 +2213,6 @@ any_bridge_descriptors_known(void) + return choose_random_entry(NULL) != NULL; + } + +-/** Return 1 if there are any directory conns fetching bridge descriptors +- * that aren't marked for close. We use this to guess if we should tell +- * the controller that we have a problem. */ +-int +-any_pending_bridge_descriptor_fetches(void) +-{ +- smartlist_t *conns = get_connection_array(); +- SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { +- if (conn->type == CONN_TYPE_DIR && +- conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC && +- TO_DIR_CONN(conn)->router_purpose == ROUTER_PURPOSE_BRIDGE && +- !conn->marked_for_close && +- conn->linked && +- conn->linked_conn && !conn->linked_conn->marked_for_close) { +- log_debug(LD_DIR, "found one: %s", conn->address); +- return 1; +- } +- } SMARTLIST_FOREACH_END(conn); +- return 0; +-} +- + /** Return 1 if we have at least one descriptor for an entry guard + * (bridge or member of EntryNodes) and all descriptors we know are + * down. Else return 0. If act is 1, then mark the down guards +diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h +index 772c666..73ac017 100644 +--- a/src/or/entrynodes.h ++++ b/src/or/entrynodes.h +@@ -105,7 +105,6 @@ void retry_bridge_descriptor_fetch_directly(const char *digest); + void fetch_bridge_descriptors(const or_options_t *options, time_t now); + void learned_bridge_descriptor(routerinfo_t *ri, int from_cache); + int any_bridge_descriptors_known(void); +-int any_pending_bridge_descriptor_fetches(void); + int entries_known_but_down(const or_options_t *options); + void entries_retry_all(const or_options_t *options); + +-- +1.8.1.2 +

1 0

[tor-browser-bundle/master] Switch the install shortcut location to /Applications.
by mikeperry＠torproject.org 07 Mar '14

07 Mar '14

commit 02d79a009b0a13d7e115d5f8c71e1298b4982ff9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 23:31:00 2014 -0800 Switch the install shortcut location to /Applications. Mac users still get lost by a default install location to Desktop.. :/ In case we decide to do more extensive A/B testing: Keep skeletons for both Desktop and Application DMG templates around. --- Bundle-Data/mac-applications.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-applications.dmg/.VolumeIcon.icns | Bin 0 -> 242224 bytes Bundle-Data/mac-applications.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 | Bin 0 -> 173 bytes Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid | 1 + Bundle-Data/mac-applications.dmg/Applications | 1 + Bundle-Data/mac-desktop.dmg/.DS_Store | Bin 0 -> 12292 bytes Bundle-Data/mac-desktop.dmg/._Desktop | Bin 0 -> 303592 bytes Bundle-Data/mac-desktop.dmg/.background/background.png | Bin 0 -> 50020 bytes Bundle-Data/mac-desktop.dmg/Desktop | Bin 0 -> 300120 bytes Bundle-Data/mac.dmg/.DS_Store | Bin 12292 -> 0 bytes Bundle-Data/mac.dmg/._Desktop | Bin 303592 -> 0 bytes Bundle-Data/mac.dmg/.background/background.png | Bin 50020 -> 0 bytes Bundle-Data/mac.dmg/Desktop | Bin 300120 -> 0 bytes gitian/descriptors/mac/gitian-bundle.yml | 5 +++-- gitian/mkbundle-mac.sh | 9 ++++++--- 16 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Bundle-Data/mac-applications.dmg/.DS_Store b/Bundle-Data/mac-applications.dmg/.DS_Store new file mode 100644 index 0000000..aeb3104 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns new file mode 100644 index 0000000..481914f Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.VolumeIcon.icns differ diff --git a/Bundle-Data/mac-applications.dmg/.background/background.png b/Bundle-Data/mac-applications.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 new file mode 100644 index 0000000..e21068d Binary files /dev/null and b/Bundle-Data/mac-applications.dmg/.fseventsd/0000000000400c60 differ diff --git a/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid new file mode 100644 index 0000000..538367d --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/.fseventsd/fseventsd-uuid @@ -0,0 +1 @@ +B29020CB-1603-4E1C-8C56-5C8A4434D120 \ No newline at end of file diff --git a/Bundle-Data/mac-applications.dmg/Applications b/Bundle-Data/mac-applications.dmg/Applications new file mode 120000 index 0000000..bd2d47f --- /dev/null +++ b/Bundle-Data/mac-applications.dmg/Applications @@ -0,0 +1 @@ +/Applications \ No newline at end of file diff --git a/Bundle-Data/mac-desktop.dmg/.DS_Store b/Bundle-Data/mac-desktop.dmg/.DS_Store new file mode 100644 index 0000000..9bec18c Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.DS_Store differ diff --git a/Bundle-Data/mac-desktop.dmg/._Desktop b/Bundle-Data/mac-desktop.dmg/._Desktop new file mode 100644 index 0000000..a1e0b7f Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/._Desktop differ diff --git a/Bundle-Data/mac-desktop.dmg/.background/background.png b/Bundle-Data/mac-desktop.dmg/.background/background.png new file mode 100644 index 0000000..94e4584 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/.background/background.png differ diff --git a/Bundle-Data/mac-desktop.dmg/Desktop b/Bundle-Data/mac-desktop.dmg/Desktop new file mode 100644 index 0000000..3c88450 Binary files /dev/null and b/Bundle-Data/mac-desktop.dmg/Desktop differ diff --git a/Bundle-Data/mac.dmg/.DS_Store b/Bundle-Data/mac.dmg/.DS_Store deleted file mode 100644 index 9bec18c..0000000 Binary files a/Bundle-Data/mac.dmg/.DS_Store and /dev/null differ diff --git a/Bundle-Data/mac.dmg/._Desktop b/Bundle-Data/mac.dmg/._Desktop deleted file mode 100644 index a1e0b7f..0000000 Binary files a/Bundle-Data/mac.dmg/._Desktop and /dev/null differ diff --git a/Bundle-Data/mac.dmg/.background/background.png b/Bundle-Data/mac.dmg/.background/background.png deleted file mode 100644 index 94e4584..0000000 Binary files a/Bundle-Data/mac.dmg/.background/background.png and /dev/null differ diff --git a/Bundle-Data/mac.dmg/Desktop b/Bundle-Data/mac.dmg/Desktop deleted file mode 100644 index 3c88450..0000000 Binary files a/Bundle-Data/mac.dmg/Desktop and /dev/null differ diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index 55a6777..4325a1b 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -36,7 +36,8 @@ files: - "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" -- "mac-dmg.zip" +- "dmg-applications.tar.xz" +- "dmg-desktop.tar.xz" - "mac-langpacks.zip" - "noscript(a)noscript.net.xpi" - "dzip.sh" @@ -148,7 +149,7 @@ script: | make cd ../../ cd dmg - unzip ~/build/mac-dmg.zip + tar -Jxvf ~/build/dmg-applications.tar.xz # FIXME: Desktop or Application as dest? cd .. # # FF24 puts the prefs in the browser jar: diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 18e0f8a..a9cbacb 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -63,9 +63,12 @@ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac rm -f $GITIAN_DIR/inputs/mac-skeleton.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-skeleton.zip . -cd ../mac.dmg -rm -f $GITIAN_DIR/inputs/mac-dmg.zip -$WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/mac-dmg.zip . +cd ../mac-desktop.dmg +rm -f $GITIAN_DIR/inputs/dmg-desktop.tar.xz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-desktop.tar.xz . +cd ../mac-applications.dmg +rm -f $GITIAN_DIR/inputs/dmg-applications.tar-gz +$WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-applications.tar.xz . cd $WRAPPER_DIR

1 0

[tor-browser-bundle/master] Bug 11042: Remove Build-ID from Firefox libs.
by mikeperry＠torproject.org 02 Mar '14

02 Mar '14

commit 9c37c9fcc639c02e9dd7b81741bbf95a24f47a31 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 14:13:50 2014 -0800 Bug 11042: Remove Build-ID from Firefox libs. It is sometimes non-deterministic (particularly for libxul.so). --- gitian/descriptors/linux/gitian-firefox.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gitian/descriptors/linux/gitian-firefox.yml b/gitian/descriptors/linux/gitian-firefox.yml index 3ee8eef..282ea49 100644 --- a/gitian/descriptors/linux/gitian-firefox.yml +++ b/gitian/descriptors/linux/gitian-firefox.yml @@ -100,6 +100,8 @@ script: | cd $INSTDIR for LIB in Browser/*.so Browser/webapprt-stub Browser/mozilla-xremote-client Browser/firefox Browser/plugin-container Browser/components/*.so # Browser/updater do + # Build-ID is sometimes non-deterministic, and we use debuglink anyway + objcopy --remove-section=.note.gnu.build-id $LIB objcopy --only-keep-debug $LIB Debug/$LIB strip $LIB objcopy --add-gnu-debuglink=./Debug/$LIB $LIB

1 0

[tor-browser-bundle/master] Set flag to build PT bundles for alpha and nightly.
by mikeperry＠torproject.org 02 Mar '14

02 Mar '14

commit 6ae73509c55eb0385b7dd0520fdee04ca3ad84e5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Sun Mar 2 13:54:45 2014 -0800 Set flag to build PT bundles for alpha and nightly. --- gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 2 files changed, 2 insertions(+) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index b6ee2c2..85ffd95 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -1,5 +1,6 @@ TORBROWSER_VERSION=4.0-alpha-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=1 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 436536e..3288c7e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -1,5 +1,6 @@ TORBROWSER_VERSION=tbb-nightly BUNDLE_LOCALES="ar ru zh-CN" +BUILD_PT_BUNDLES=1 VERIFY_TAGS=0

1 0

[tor-browser-bundle/master] Relocate bridges from torrc appendices to a prefs file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit 3279db32f147479af225d7106949e8dddd360dbb Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:02:10 2014 -0800 Relocate bridges from torrc appendices to a prefs file. --- Bundle-Data/beta/bridge_prefs.js | 15 ++++++++ Bundle-Data/beta/linux/torrc-defaults-appendix | 40 +++++----------------- Bundle-Data/beta/mac/torrc-defaults-appendix | 23 ------------- Bundle-Data/beta/windows/torrc-defaults-appendix | 22 ------------ 4 files changed, 23 insertions(+), 77 deletions(-) diff --git a/Bundle-Data/beta/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/beta/bridge_prefs.js @@ -0,0 +1,15 @@ +# Tor Launcher preferences (default bridges): +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs3"); + +// Default bridges. +pref("extensions.torlauncher.default_bridge.obfs3.1", "obfs3 83.212.101.3:60475 A09D536DD1752D542E1FBB3C9CE4449D51298239"); +pref("extensions.torlauncher.default_bridge.obfs3.2", "obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.3", "obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9"); +pref("extensions.torlauncher.default_bridge.obfs3.4", "obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2"); +pref("extensions.torlauncher.default_bridge.obfs3.5", "obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F"); +pref("extensions.torlauncher.default_bridge.obfs3.6", "obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD"); +pref("extensions.torlauncher.default_bridge.obfs3.7", "obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E"); + +pref("extensions.torlauncher.default_bridge.flashproxy.1", "flashproxy 0.0.1.0:1"); + +pref("extensions.torlauncher.default_bridge.fte.1", "fte bridges.fteproxy.org:8080"); diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix index b43cd59..d0f621e 100644 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -1,35 +1,11 @@ - ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed - - -## flash proxy configuration -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed +## flash proxy configuration +# +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix index d3e211d..e1ada73 100644 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -1,34 +1,11 @@ - ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed ## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - ## flash proxy configuration # -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding). diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix index 965b98a..049d2ff 100644 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -1,33 +1,11 @@ ## fteproxy configuration -# Bridge fte bridges.fteproxy.org:8080 - ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed ## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 83.212.101.2:443 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D -# Bridge obfs3 169.229.59.74:31493 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 169.229.59.75:46328 AF9F66B7B04F8FF6F32D455F05135250A16543C9 -# Bridge obfs3 209.141.36.236:45496 58D91C3A631F910F32E18A55441D5A0463BA66E2 -# Bridge obfs3 208.79.90.242:35658 BA61757846841D64A83EA2514C766CB92F1FB41F -# Bridge obfs3 109.105.109.163:38980 9D7259A696F7DAB073043B28114112A46D36CFFD -# Bridge obfs3 109.105.109.163:47779 844B1F53FFD548C998F8D3B01B7E19FA07C3396E -# -# Bridge obfs2 83.212.100.216:47870 1F01A7BB60F49FC96E0850A6BAD6D076DFEFAF80 -# Bridge obfs2 83.212.96.182:46602 6F058CBEF888EB20D1DEB9886909F1E812245D41 -# Bridge obfs2 70.182.182.109:54542 94C9E691688FAFDEC701A0788BD15BE8AD34ED35 -# Bridge obfs2 128.31.0.34:1051 CA7434F14A898C7D3427B8295A7F83446BC7F496 -# Bridge obfs2 83.212.101.2:45235 2ADFE7AA8D272C520D1FBFBF4E413F3A1B26313D - ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - ## flash proxy configuration # -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - # Change the second number here (9000) to the number of a port that can # receive connections from the Internet (the port for which you # configured port forwarding).

1 0