- tbb-commits - lists.torproject.org

[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 <b>conn</b> 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 <b>act</b> 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] 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] Append bridge lines to PT bundles.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f29ec39f7bd73fcadf83f051c9add246e4d0c4f4 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:11:16 2014 -0800 Append bridge lines to PT bundles. --- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ gitian/mkbundle-linux.sh | 3 ++- gitian/mkbundle-mac.sh | 3 ++- gitian/mkbundle-windows.sh | 3 ++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 36c2efc..3fa79cc 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -31,6 +31,7 @@ files: - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" - "torrc-defaults-appendix-linux" +- "bridge_prefs.js" - "relativelink-src.zip" - "linux-skeleton.zip" - "linux-langpacks.zip" @@ -106,6 +107,7 @@ script: | if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi chmod 700 Data/Browser chmod 700 Data/Tor diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index da7e918..63c0a96 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -33,6 +33,7 @@ files: - "tor-mac32-gbuilt.zip" - "pluggable-transports-mac32-gbuilt.zip" - "torrc-defaults-appendix-mac" +- "bridge_prefs.js" - "relativelink-src.zip" - "mac-skeleton.zip" - "mac-dmg.zip" @@ -125,6 +126,7 @@ script: | unzip ~/build/tbb-docs.zip if [ $BUILD_PT_BUNDLES ]; then cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index 8cf2f05..c8b29c9 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -28,6 +28,7 @@ files: - "tor-win32-gbuilt.zip" - "pluggable-transports-win32-gbuilt.zip" - "torrc-defaults-appendix-windows" +- "bridge_prefs.js" - "relativelink-src.zip" - "windows-skeleton.zip" - "win32-langpacks.zip" @@ -108,6 +109,7 @@ script: | if [ $BUILD_PT_BUNDLES ]; then unzip ~/build/pluggable-transports-win32-gbuilt.zip cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults + cat ~/build/bridge_prefs.js >> Data/Browser/profile.default/preferences/extension-overrides.js fi cd .. # diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 34485ae..b4e635d 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux +cp PTConfigs/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cd linux rm -f $GITIAN_DIR/inputs/linux-skeleton.zip diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index d6bffce..18e0f8a 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -56,7 +56,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +cp PTConfigs/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cp mac-tor.sh $GITIAN_DIR/inputs/ cd mac diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 037b031..7ab0aa6 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -58,7 +58,8 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ -cp beta/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows +cp PTConfigs/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows +cp PTConfigs/bridge_prefs.js $GITIAN_DIR/inputs/ cd windows rm -f $GITIAN_DIR/inputs/windows-skeleton.zip

1 0

[tor-browser-bundle/master] Rename 'beta' to PTConfigs.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit f8e7d91b4ed2e2d8f263b8b9898ce31ac28abfba Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 10:04:36 2014 -0800 Rename 'beta' to PTConfigs. --- Bundle-Data/PTConfigs/bridge_prefs.js | 15 +++++++++++++++ Bundle-Data/PTConfigs/linux/torrc-defaults-appendix | 11 +++++++++++ Bundle-Data/PTConfigs/mac/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 12 ++++++++++++ Bundle-Data/beta/bridge_prefs.js | 15 --------------- Bundle-Data/beta/linux/torrc-defaults-appendix | 11 ----------- Bundle-Data/beta/mac/torrc-defaults-appendix | 12 ------------ Bundle-Data/beta/windows/torrc-defaults-appendix | 12 ------------ 8 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js new file mode 100644 index 0000000..e3d6b69 --- /dev/null +++ b/Bundle-Data/PTConfigs/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/PTConfigs/linux/torrc-defaults-appendix b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix new file mode 100644 index 0000000..d0f621e --- /dev/null +++ b/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix @@ -0,0 +1,11 @@ +## fteproxy configuration +ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed + +## 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/PTConfigs/mac/torrc-defaults-appendix b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix new file mode 100644 index 0000000..e1ada73 --- /dev/null +++ b/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec 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 PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix new file mode 100644 index 0000000..049d2ff --- /dev/null +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -0,0 +1,12 @@ +## fteproxy configuration +ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed + +## obfsproxy configuration +ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy 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/bridge_prefs.js b/Bundle-Data/beta/bridge_prefs.js deleted file mode 100644 index e3d6b69..0000000 --- a/Bundle-Data/beta/bridge_prefs.js +++ /dev/null @@ -1,15 +0,0 @@ -# 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 deleted file mode 100644 index d0f621e..0000000 --- a/Bundle-Data/beta/linux/torrc-defaults-appendix +++ /dev/null @@ -1,11 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec ./Tor/PluggableTransports/fteproxy --managed - -## 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 deleted file mode 100644 index e1ada73..0000000 --- a/Bundle-Data/beta/mac/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec PluggableTransports/fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec 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 PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix deleted file mode 100644 index 049d2ff..0000000 --- a/Bundle-Data/beta/windows/torrc-defaults-appendix +++ /dev/null @@ -1,12 +0,0 @@ -## fteproxy configuration -ClientTransportPlugin fte exec Tor\PluggableTransports\fteproxy --managed - -## obfsproxy configuration -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy 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

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

[tor-browser-bundle/master] Remove a diff file.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit ec7da09f018252ff92d3728eb22e27e0934f83d1 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 05:25:35 2014 -0800 Remove a diff file. It got added during a conflict resolution that got squashed. --- gitian/versions.diff | 45 --------------------------------------------- 1 file changed, 45 deletions(-) diff --git a/gitian/versions.diff b/gitian/versions.diff deleted file mode 100644 index 69001a8..0000000 --- a/gitian/versions.diff +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/gitian/versions.nightly b/gitian/versions.nightly -index b9b5835..f3dfe9d 100755 ---- a/gitian/versions.nightly -+++ b/gitian/versions.nightly -@@ -12,13 +12,14 @@ NSIS_TAG=v0.1 - ZLIB_TAG=v1.2.8 - LIBEVENT_TAG=release-2.0.21-stable - MINGW_REV=6184 --PYPTLIB_TAG=pyptlib-0.0.4 --OBFSPROXY_TAG=obfsproxy-0.2.3 -+PYPTLIB_TAG=pyptlib-0.0.5 -+OBFSPROXY_TAG=obfsproxy-0.2.4 - FLASHPROXY_TAG=1.6 - - GITIAN_TAG=tor-browser-builder-3.0-4 - - OPENSSL_VER=1.0.1f -+GMP_VER=5.1.3 - FIREFOX_LANG_VER=24.3.0esr - BINUTILS_VER=2.22 - GCC_VER=4.6.3 -@@ -33,6 +34,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 - TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz - OSXSDK_PACKAGE=apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb -@@ -52,6 +54,7 @@ SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz - - # Hashes for packages with weak sigs or no sigs - OPENSSL_HASH=6cc2a80b17d64de6b7bac985745fdaba971d54ffd7d38d3556f998d7c0c9cb5a -+GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 - OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc - TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 - NOSCRIPT_HASH=0d90f283ee9e3be5bb1ebc315fab12994ff5a15380bd3a2fdff62750286b4ea1 -@@ -67,6 +70,7 @@ SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 - - ## Non-git package URLs - 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… - OSXSDK_URL=https://launchpad.net/~flosoft/+archive/cross-apple/+files/${OSX… - BINUTILS_URL=https://ftp.gnu.org/gnu/binutils/${BINUTILS_PACKAGE}

1 0

[tor-browser-bundle/master] Specify a tag for fteproxy for all builds.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit d4470583ce2d681589e1f56b73fbbef83c3510be Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Feb 28 09:39:48 2014 -0800 Specify a tag for fteproxy for all builds. --- gitian/versions | 1 + gitian/versions.alpha | 1 + gitian/versions.nightly | 1 + 3 files changed, 3 insertions(+) diff --git a/gitian/versions b/gitian/versions index 389e3e1..11eb1db 100755 --- a/gitian/versions +++ b/gitian/versions @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index f190d5a..b6ee2c2 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=pyptlib-0.0.5 OBFSPROXY_TAG=obfsproxy-0.2.4 FLASHPROXY_TAG=1.6 +FTEPROXY_TAG=0.2.6 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5 diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 0c7f50d..436536e 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -15,6 +15,7 @@ MINGW_REV=6184 PYPTLIB_TAG=master OBFSPROXY_TAG=master FLASHPROXY_TAG=master +FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 GITIAN_TAG=tor-browser-builder-3.x-5

1 0

[tor-browser-bundle/master] Bug 9353: Fix ibus issues on some Linux systems.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit c05c7728ef352e598750993190b76485addc26a2 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Feb 28 09:55:55 2014 +0000 Bug 9353: Fix ibus issues on some Linux systems. --- RelativeLink/RelativeLink.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 9bab08c..0d25a28 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -189,6 +189,13 @@ fi mydir="`dirname "$myname"`" test -d "$mydir" && cd "$mydir" +# This is a fix for an ibus issue on some Linux systems. See #9353 for more +# details. The symlink needs to be created before we change HOME. +if [ ! -d ".config/ibus" ]; then + mkdir -p .config/ibus + ln -nsf ~/.config/ibus/bus .config/ibus +fi + # If ${PWD} results in a zero length HOME, we can try something else... if [ ! "${PWD}" ]; then # "hacking around some braindamage"

1 0

[tor-browser-bundle/master] Bump versions for Tor Launcher.
by mikeperry＠torproject.org 28 Feb '14

28 Feb '14

commit fb91914f6901509eab2daaa11b607a789646393d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Feb 27 21:46:23 2014 -0800 Bump versions for Tor Launcher. --- gitian/versions.alpha | 2 +- gitian/versions.beta | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 87b68ca..f190d5a 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -5,7 +5,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.5.1-alpha -TORLAUNCHER_TAG=0.2.4.4 +TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 diff --git a/gitian/versions.beta b/gitian/versions.beta index d68854a..a2c91b9 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=3.6-beta-2 +TORBROWSER_VERSION=3.6-beta-1 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru vi zh-CN" BUILD_PT_BUNDLES=1 @@ -6,7 +6,7 @@ VERIFY_TAGS=1 TORBROWSER_TAG=tor-browser-24.3.0esr-3.x-3-build2 TOR_TAG=tor-0.2.4.20 -TORLAUNCHER_TAG=0.2.4.4 +TORLAUNCHER_TAG=0.2.5.0 TORBUTTON_TAG=1.6.6.0 HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1

1 0