- tbb-commits - lists.torproject.org

[tor-launcher/maint-0.2.10] Version bump for 0.2.10.3
by gk＠torproject.org 19 Jan '17

19 Jan '17

commit 4749302f7032be5e1ccf7806872385d8cafcb989 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 17 12:21:36 2017 +0000 Version bump for 0.2.10.3 --- src/install.rdf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install.rdf b/src/install.rdf index 5664b03..ce914f4 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -7,7 +7,7 @@ <em:creator>The Tor Project, Inc.</em:creator> <em:contributor>Pearl Crescent, LLC</em:contributor> <em:id>tor-launcher(a)torproject.org</em:id> - <em:version>0.2.10.2</em:version> + <em:version>0.2.10.3</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html</em:homepageURL> <em:updateURL>data:text/plain,</em:updateURL> <em:updateKey>-</em:updateKey>

1 0

[tor-browser/tor-browser-45.6.0esr-6.5-1] Bug 20981: On Windows, check TZ for timezone first
by gk＠torproject.org 19 Jan '17

19 Jan '17

commit 025f08062d4e633432e0248bbd047ac5d61c4399 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Jan 14 01:58:14 2017 -0800 Bug 20981: On Windows, check TZ for timezone first --- intl/icu/source/common/putil.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/intl/icu/source/common/putil.cpp b/intl/icu/source/common/putil.cpp index c87b60e..2f5f4fe 100644 --- a/intl/icu/source/common/putil.cpp +++ b/intl/icu/source/common/putil.cpp @@ -984,6 +984,11 @@ uprv_tzname(int n) { const char *tzid = NULL; #if U_PLATFORM_USES_ONLY_WIN32_API + char* envValue = getenv("TZ"); + if (envValue != NULL) { + return uprv_strdup(envValue); + } + tzid = uprv_detectWindowsTimeZone(); if (tzid != NULL) {

1 0

[tor-browser-bundle/master] Bug 20989: Browser sandbox profile is too restrictive on OSX 10.12.2
by gk＠torproject.org 18 Jan '17

18 Jan '17

commit f55cbeea243675db8acf1015ca7e1ceed39f0933 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Tue Jan 17 10:27:25 2017 -0500 Bug 20989: Browser sandbox profile is too restrictive on OSX 10.12.2 Allow full read access to all files under /usr/lib. Allow full read access to /Library/Preferences/com.apple.ViewBridge.plist. Allow writes to TorBrowser-Data/Browser/profiles.ini (otherwise, a new browser profile is created each time the browser is opened). --- Bundle-Data/mac-sandbox/tb.sb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Bundle-Data/mac-sandbox/tb.sb b/Bundle-Data/mac-sandbox/tb.sb index eda7a1f..385e914 100644 --- a/Bundle-Data/mac-sandbox/tb.sb +++ b/Bundle-Data/mac-sandbox/tb.sb @@ -28,6 +28,7 @@ (allow file-read* (path "/Library/Preferences/com.apple.HIToolbox.plist") + (path "/Library/Preferences/com.apple.ViewBridge.plist") (path "/Library/Preferences/.GlobalPreferences.plist") (path "/dev/random") (path "/dev/urandom") @@ -41,6 +42,7 @@ (subpath "/Library/Fonts") (subpath "/System") (subpath "/private/var/folders") + (subpath "/usr/lib") (subpath "/usr/share") (home-subpath "/Downloads") (home-subpath "/Library/Input Methods") @@ -66,7 +68,6 @@ (path "/private/var/db/.AppleSetupDone") (path "/tmp") (path "/var") - (subpath "/usr/lib") (torbrowser-data-dir-path "/Tor/control.socket") (torbrowser-data-dir-path "/Tor/socks.socket") (path-regex "/private/tmp/Tor[-0-9]*/control.socket") @@ -86,11 +87,6 @@ (path "/Library/Preferences/.GlobalPreferences.plist") ) -; Disallow writes to the profiles ini file. -(deny file-write* - (torbrowser-data-dir-subpath "/Browser/profiles.ini") -) - (allow iokit-open) (allow ipc-posix-shm

1 0

[tor-browser-bundle/master] Bump NoScript version to 2.9.5.3
by gk＠torproject.org 18 Jan '17

18 Jan '17

commit 2db14ba274f3fc1fc8a1ddaba4ca56ba4ea6e96e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 18 12:02:15 2017 +0000 Bump NoScript version to 2.9.5.3 --- gitian/versions.alpha | 4 ++-- gitian/versions.nightly | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 14ed662..50c2158 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -77,7 +77,7 @@ NSIS_VER=2.51 ## 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.9.5.2-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -111,7 +111,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ed71ca922790e81bc5e8c6a87bb81f394a38676ac37d1fba518a6a428d128dd5 +NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1b1b346..0ca5ed6 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -84,7 +84,7 @@ NSIS_VER=2.51 ## 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.9.5.2-fx+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.9.5.3-fx+sm.xpi TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz CCTOOLS_PACKAGE=cctools.tar.gz OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz @@ -118,7 +118,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=ed71ca922790e81bc5e8c6a87bb81f394a38676ac37d1fba518a6a428d128dd5 +NOSCRIPT_HASH=ce9779a3a5a2574b958f8e4d079a99d43a8f84193bef52c587c704ed81c2fbbd CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[torbutton/master] Bug 21243: Add links to es, fr, pt Tor Browser manual
by gk＠torproject.org 18 Jan '17

18 Jan '17

commit 4e9c7c8ba121e0ec39d65deefd5cea3657dcc27d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Tue Jan 17 17:42:12 2017 -0800 Bug 21243: Add links to es, fr, pt Tor Browser manual --- src/chrome/content/menu-overlay.xul | 8 ++++---- src/chrome/content/torbutton.js | 10 +++------- src/chrome/locale/en/aboutTor.dtd | 3 ++- src/chrome/locale/en/torbutton.dtd | 2 -- src/chrome/locale/es/aboutTor.dtd | 3 ++- src/chrome/locale/fr/aboutTor.dtd | 3 ++- src/chrome/locale/pt-BR/aboutTor.dtd | 3 ++- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/chrome/content/menu-overlay.xul b/src/chrome/content/menu-overlay.xul index 8067b5c..4970114 100644 --- a/src/chrome/content/menu-overlay.xul +++ b/src/chrome/content/menu-overlay.xul @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>  -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> +<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/aboutTor.dtd"> <overlay id="torbutton-menu-overlay" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> @@ -20,8 +20,8 @@ <menuitem name="torBrowserUserManual" id="torBrowserUserManual" position="1" - label="&torbutton.torbrowser_user_manual.label;" - accesskey="&torbutton.torbrowser_user_manual.accesskey;" - oncommand="torbutton_open_torbrowser_user_manual()" /> + label="&aboutTor.torbrowser_user_manual.label;" + accesskey="&aboutTor.torbrowser_user_manual.accesskey;" + oncommand="gBrowser.selectedTab = gBrowser.addTab('&aboutTor.torbrowser_user_manual.link;')" /> </menupopup> </overlay> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index dacc43e..62b9371 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2440,15 +2440,11 @@ function torbutton_update_noscript_button() }, 0); } -// Opens the Tor Browser User Manual in a new tab -function torbutton_open_torbrowser_user_manual() { - gBrowser.selectedTab = gBrowser.addTab("https://tb-manual.torproject.org"); -} - // Returns true if we should show the tor browser manual. function torbutton_show_torbrowser_manual() { - let locale = torbutton_get_general_useragent_locale(); - return locale.startsWith("en"); + let availableLocales = ["en", "es", "fr", "pt"]; + let shortLocale = torbutton_get_general_useragent_locale().substring(0, 2); + return availableLocales.indexOf(shortLocale) >= 0; } // Makes sure the item in the Help Menu and the link in about:tor diff --git a/src/chrome/locale/en/aboutTor.dtd b/src/chrome/locale/en/aboutTor.dtd index 4385ca8..3950ff9 100644 --- a/src/chrome/locale/en/aboutTor.dtd +++ b/src/chrome/locale/en/aboutTor.dtd @@ -29,8 +29,9 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor is NOT all you need to browse anonymously! You may need to change some of your browsing habits to ensure your identity stays safe."> <!ENTITY aboutTor.whatnext.label "Tips On Staying Anonymous »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Tor Browser User Manual »"> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/en-US"> <!ENTITY aboutTor.helpInfo1.label "You Can Help!"> <!ENTITY aboutTor.helpInfo2.label "There are many ways you can help make the Tor Network faster and stronger:"> <!ENTITY aboutTor.helpInfo3.label "Run a Tor Relay Node »"> diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index c67ec6e..97a994f 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -59,5 +59,3 @@ <!ENTITY torbutton.prefs.sec_webfonts_desc "Some fonts and icons may display incorrectly."> <!ENTITY torbutton.prefs.sec_webfonts_desc_tooltip "Website-provided font files are blocked."> <!ENTITY torbutton.circuit_display.title "Tor circuit for this site"> -<!ENTITY torbutton.torbrowser_user_manual.label "Tor Browser User Manual"> -<!ENTITY torbutton.torbrowser_user_manual.accesskey "M"> diff --git a/src/chrome/locale/es/aboutTor.dtd b/src/chrome/locale/es/aboutTor.dtd index 6983c83..0fddda4 100644 --- a/src/chrome/locale/es/aboutTor.dtd +++ b/src/chrome/locale/es/aboutTor.dtd @@ -29,8 +29,9 @@ <!ENTITY aboutTor.whatnextAnswer.label "¡Tor NO es todo lo que necesita para navegar anónimamente! Puede necesitar cambiar alguno de sus hábitos de navegación para asegurar que su identidad permanezca segura."> <!ENTITY aboutTor.whatnext.label "Consejos para permenecer anónimo »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Manual de usuario del Navegador Tor »"> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/es-ES"> <!ENTITY aboutTor.helpInfo1.label "¡Usted puede ayudar!"> <!ENTITY aboutTor.helpInfo2.label "Hay muchas formas en que las puede ayudar a hacer la red Tor más rápida y fuerte."> <!ENTITY aboutTor.helpInfo3.label "Ejecutar un nodo de repetidor Tor »"> diff --git a/src/chrome/locale/fr/aboutTor.dtd b/src/chrome/locale/fr/aboutTor.dtd index ad72a27..c2e990b 100644 --- a/src/chrome/locale/fr/aboutTor.dtd +++ b/src/chrome/locale/fr/aboutTor.dtd @@ -29,8 +29,9 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor n'est PAS tout ce dont vous avez besoin pour naviguer anonymement! Vous aurez peut-être à changer certaines de vos habitudes de navigation pour garder votre identité en sécurité."> <!ENTITY aboutTor.whatnext.label "Conseils pour rester anonyme »"> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "G"> <!ENTITY aboutTor.torbrowser_user_manual.label "Le guide d'utilisation du navigateur Tor »"> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/fr"> <!ENTITY aboutTor.helpInfo1.label "Vous pouvez aider !"> <!ENTITY aboutTor.helpInfo2.label "Vous pouvez aider à rendre le réseau Tor plus rapide et plus puissant de plusieurs façons :"> <!ENTITY aboutTor.helpInfo3.label "Faire tourner un nœud relais Tor »"> diff --git a/src/chrome/locale/pt-BR/aboutTor.dtd b/src/chrome/locale/pt-BR/aboutTor.dtd index 04548e0..7991929 100644 --- a/src/chrome/locale/pt-BR/aboutTor.dtd +++ b/src/chrome/locale/pt-BR/aboutTor.dtd @@ -29,8 +29,9 @@ <!ENTITY aboutTor.whatnextAnswer.label "Tor NÃO é tudo o que você precisa para navegar anonimamente! Para isso, você precisará mudar alguns hábitos de utilização da Internet, que garantirão a proteção da sua identidade. "> <!ENTITY aboutTor.whatnext.label "Dicas para garantir seu anonimato""> <!ENTITY aboutTor.whatnext.link "https://www.torproject.org/download/download.html.en#warning"> +<!ENTITY aboutTor.torbrowser_user_manual.accesskey "M"> <!ENTITY aboutTor.torbrowser_user_manual.label "Manual de Uso do Navegador Tor » "> -<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org"> +<!ENTITY aboutTor.torbrowser_user_manual.link "https://tb-manual.torproject.org/pt-BR"> <!ENTITY aboutTor.helpInfo1.label "Você pode ajudar!"> <!ENTITY aboutTor.helpInfo2.label "Existem várias maneiras de ajudar a rede Tor a tornar-se mais rápida e eficaz:"> <!ENTITY aboutTor.helpInfo3.label "Rodar um Nó de Retransmissor Tor »">

1 0

[tor-browser/tor-browser-45.6.0esr-6.5-1] Bug 20589: Adding new MAR signing key
by gk＠torproject.org 18 Jan '17

18 Jan '17

commit d69306e9517d718a6019b6f4814ef93591185895 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 12 09:43:22 2017 +0000 Bug 20589: Adding new MAR signing key We make the certificate for the secondary key the new primary one, partly due to #15532 and add the certificate for the new key as the secondary one. --- toolkit/mozapps/update/updater/release_primary.der | Bin 1229 -> 1229 bytes toolkit/mozapps/update/updater/release_secondary.der | Bin 1229 -> 1229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/toolkit/mozapps/update/updater/release_primary.der b/toolkit/mozapps/update/updater/release_primary.der index 542fb24..49a7c01 100644 Binary files a/toolkit/mozapps/update/updater/release_primary.der and b/toolkit/mozapps/update/updater/release_primary.der differ diff --git a/toolkit/mozapps/update/updater/release_secondary.der b/toolkit/mozapps/update/updater/release_secondary.der index 49a7c01..cce7860 100644 Binary files a/toolkit/mozapps/update/updater/release_secondary.der and b/toolkit/mozapps/update/updater/release_secondary.der differ

1 0

[torbutton/master] Fold in missing 1.9.5 changelogs
by gk＠torproject.org 17 Jan '17

17 Jan '17

commit 7439de870b396a31bacddf7968e2a1c24ad523c7 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 17 12:13:46 2017 +0000 Fold in missing 1.9.5 changelogs --- src/CHANGELOG | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 8120096..62901a5 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,6 +1,9 @@ 1.9.6.9 * Bug 20947: Donation banner improvements +1.9.5.13 + * Bug 20947: Donation banner improvements + 1.9.6.8 * Bug 16622: Timezone spoofing moved to tor-browser.git * Bug 20701: Allow the directory listing stylesheet in the content policy @@ -27,6 +30,10 @@ * Bug 20388+20399+20394: Code clean-up * Translation updates +1.9.5.12 + * Bug 20414: Add donation banner on about:tor for 2016 campaign + * Translation updates + 1.9.6.4 * Bug 17334: Move referrer spoofing for .onion domains into tor-browser.git * Bug 17767: Make "JavaScript disabled" more visible in Security Slider @@ -40,6 +47,10 @@ * Bug 14271: Make Torbutton work with Unix Domain Socket option * Translation updates +1.9.5.7 + * Bug 18589: Clear site security settings during New Identity + * Bug 19906: "Maximizing Tor Browser" Notification can exist multiple times + 1.9.6.1 * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled) @@ -47,6 +58,13 @@ * Bug 19273: Improve external app launch handling and associated warnings * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy +1.9.5.6 + * Bug 19417: Disable asmjs for now + * Bug 19689: Use proper parent windows for plugin prompt + +1.9.5.5 + * Bug 19417: Clear asmjscache + 1.9.6 * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu * Bug 18905: Hide unusable items from help menu

1 0

[tor-browser-bundle/maint-6.5] Fix typos in macOS build script
by gk＠torproject.org 17 Jan '17

17 Jan '17

commit 5144d4e8d7156aae222a0ea4d57425d387eb62e9 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 17 11:17:50 2017 +0000 Fix typos in macOS build script --- gitian/mkbundle-mac.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index eaec986..ed05b22 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -97,7 +97,7 @@ 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 +rm -f $GITIAN_DIR/inputs/dmg-applications.tar.xz $WRAPPER_DIR/build-helpers/dtar.sh $GITIAN_DIR/inputs/dmg-applications.tar.xz . cd $WRAPPER_DIR

1 0

[tor-browser-bundle/maint-6.5] No sandboxing on the stable series yet
by gk＠torproject.org 17 Jan '17

17 Jan '17

commit 739843fe174510efe4cef427daab1f32b01cdcf4 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Jan 17 11:01:15 2017 +0000 No sandboxing on the stable series yet --- gitian/versions.alpha | 3 --- 1 file changed, 3 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index a8a08c1..585037b 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -41,9 +41,6 @@ GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300 GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844 OBFS4_TAG=obfs4proxy-0.0.5 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2 -ERRORS_TAG=248dadf4e9068a0b3e79f02ed0a610d935de5302 -GB_TAG=06cc925cce6592e922dcc4839a8b44feb384e71e -SANDBOX_TAG=sandboxed-tor-browser-0.0.2 GITIAN_TAG=tor-browser-builder-4-2

1 0

[torbutton/master] Bug 21194: Show snowflake in the circuit display
by gk＠torproject.org 17 Jan '17

17 Jan '17

commit cc1fd58f8fc99d580e5d032ac113e08409f786be Author: Georg Koppen <gk(a)torproject.org> Date: Wed Jan 11 10:31:52 2017 +0000 Bug 21194: Show snowflake in the circuit display --- src/modules/tor-control-port.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index b3d431a..3491efc 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -486,8 +486,8 @@ info.bridgeParser = function(bridgeLine) { // Several bridge types have a similar format: } else { result.type = tokens[0]; - if (["flashproxy", "fte", "meek", "obfs3", "obfs4", "scramblesuit"] - .indexOf(result.type) >= 0) { + if (["flashproxy", "fte", "meek", "obfs3", "obfs4", "scramblesuit", + "snowflake"].indexOf(result.type) >= 0) { [result.address, result.ID] = tokens.slice(1); } }

1 0