- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 21326: Update the "Using a system-installed Tor" section.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 57fed3156c39a29d742a4f9a535edcea2cb733e0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 14:06:44 2017 -0500 Bug 21326: Update the "Using a system-installed Tor" section. Adjust the comments to account for recent Torbutton changes. --- RelativeLink/start-tor-browser | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index f556389..a78b367 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -3,7 +3,7 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # -# Copyright 2015 The Tor Project. See LICENSE for licensing information. +# Copyright 2017 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser" @@ -316,17 +316,13 @@ EOF # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> +# network.security.ports.banned [...],<SocksPort>,<ControlPort> +# network.proxy.socks 127.0.0.1 +# network.proxy.socks_port <SocksPort> # extensions.torbutton.inserted_button true # extensions.torbutton.launch_warning false # extensions.torbutton.loglevel 2 # extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0

[tor-browser-bundle/hardened-builds] Bug 21326: Update the "Using a system-installed Tor" section.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 46d7d6b7da4457bb60e2c69ddb79b5d17fa95ba1 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Jan 26 14:06:44 2017 -0500 Bug 21326: Update the "Using a system-installed Tor" section. Adjust the comments to account for recent Torbutton changes. --- RelativeLink/start-tor-browser | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/RelativeLink/start-tor-browser b/RelativeLink/start-tor-browser index 19c5cfc..2cd4d76 100755 --- a/RelativeLink/start-tor-browser +++ b/RelativeLink/start-tor-browser @@ -3,7 +3,7 @@ # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similar features. # -# Copyright 2015 The Tor Project. See LICENSE for licensing information. +# Copyright 2017 The Tor Project. See LICENSE for licensing information. complain_dialog_title="Tor Browser" @@ -323,17 +323,13 @@ EOF # torrc): # # SETTING NAME VALUE -# extensions.torbutton.banned_ports [...],<SocksPort>,<ControlPort> -# extensions.torbutton.block_disk false -# extensions.torbutton.custom.socks_host 127.0.0.1 -# extensions.torbutton.custom.socks_port <SocksPort> +# network.security.ports.banned [...],<SocksPort>,<ControlPort> +# network.proxy.socks 127.0.0.1 +# network.proxy.socks_port <SocksPort> # extensions.torbutton.inserted_button true # extensions.torbutton.launch_warning false # extensions.torbutton.loglevel 2 # extensions.torbutton.logmethod 0 -# extensions.torbutton.settings_method custom -# extensions.torbutton.socks_port <SocksPort> -# extensions.torbutton.use_privoxy false # extensions.torlauncher.control_port <ControlPort> # extensions.torlauncher.loglevel 2 # extensions.torlauncher.logmethod 0

1 0

[tor-browser-bundle/hardened-builds] Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 6bd92c5d7a8052b4603a3d0e2f9e412f8ac0d4b1 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge. https://lists.torproject.org/pipermail/tor-project/2017-January/000906.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index bd92585..c56d316 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -37,6 +37,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3");

1 0

[tor-browser-bundle/master] Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge.
by gk＠torproject.org 30 Jan '17

30 Jan '17

commit 92c82fb6b5aa06c9ed4c304d47aca1bf3e92d1ca Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jan 23 17:48:50 2017 -0800 Bug 21342: Move meek-azure to the meek.azureedge.net backend and cymrubridge02 bridge. https://lists.torproject.org/pipermail/tor-project/2017-January/000906.html --- Bundle-Data/PTConfigs/bridge_prefs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Bundle-Data/PTConfigs/bridge_prefs.js b/Bundle-Data/PTConfigs/bridge_prefs.js index bd92585..c56d316 100644 --- a/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/Bundle-Data/PTConfigs/bridge_prefs.js @@ -37,6 +37,6 @@ pref("extensions.torlauncher.default_bridge.obfs4.19", "obfs4 192.95.36.142:443 pref("extensions.torlauncher.default_bridge.obfs4.20", "obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-amazon.1", "meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com"); -pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com"); +pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek 0.0.2.0:3 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"); pref("extensions.torlauncher.default_bridge.snowflake.1", "snowflake 0.0.3.0:1 B05EC36590AC0374F0E4D36DDA77908FD59D97F3");

1 0

[tor-browser-build/master] Update firefox version
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit d241887e93f6aa4498b7867d632b68be96ad0969 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 11:17:41 2017 +0100 Update firefox version --- projects/firefox/config | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 0d1a4ac..52fc7c5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,15 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-6.5-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' git_url: https://git.torproject.org/tor-browser.git tag_gpg_id: 1 gpg_keyring: torbutton.gpg remote_docker: 1 var: - firefox_version: 45.6.0esr + firefox_version: 45.7.0esr + torbrowser_branch: 7.0 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps:

1 0

[tor-browser-build/master] Update torbutton version
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit d8f79f68877eefc91c3b4afff2d46a8e2e4dad25 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 11:07:41 2017 +0100 Update torbutton version --- projects/torbutton/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/torbutton/config b/projects/torbutton/config index 71d10d8..5ff51f8 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.6.8 +version: 1.9.7 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg

1 0

[tor-browser-build/master] Update https-everywhere version
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit ed40d8b4441762e2a875b1ef4bc90c919ee6dddc Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 11:13:40 2017 +0100 Update https-everywhere version --- projects/https-everywhere/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 8611b80..557473d 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.2.8 +version: 5.2.9 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1

1 0

[tor-browser-build/master] Update tor version
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit 2de1a92d2dea07c11ccbfabb031629906053668d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Jan 30 11:07:20 2017 +0100 Update tor version --- projects/tor/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor/config b/projects/tor/config index e2e556f..b73a447 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.2.9.6-rc +version: 0.3.0.2-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg

1 0

[tor-browser-build/master] Add Bill's new key
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit b37d4c632f91c92118aee21f301ba6262e29d5f1 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Jan 19 11:50:43 2017 +0000 Add Bill's new key --- keyring/https-everywhere.gpg | Bin 194393 -> 203297 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/https-everywhere.gpg b/keyring/https-everywhere.gpg index fdd8d4f..f6a9dfc 100644 Binary files a/keyring/https-everywhere.gpg and b/keyring/https-everywhere.gpg differ

1 0

[tor-browser-build/master] Fix typo and copyright date python helper
by boklm＠torproject.org 30 Jan '17

30 Jan '17

commit fce8c7dfd80c07744d8308d70c23e25caee07374 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jan 27 11:43:19 2017 +0000 Fix typo and copyright date python helper --- projects/tor-browser/pe_checksum_fix.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/tor-browser/pe_checksum_fix.py b/projects/tor-browser/pe_checksum_fix.py index 101e77f..85d8fef 100755 --- a/projects/tor-browser/pe_checksum_fix.py +++ b/projects/tor-browser/pe_checksum_fix.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright (c) 2015, The Tor Project, Inc. +# Copyright (c) 2015-2017, The Tor Project, Inc. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are @@ -37,7 +37,7 @@ SHA256 mismatch if one tries to check that the binary we offer is actually the the one we got from our reproducible builds. This small Python snippet does both things: It pads the .exe if necessary and it -recalculates the PE-file checksum. Details of the discussion can be foun in bug +recalculates the PE-file checksum. Details of the discussion can be found in bug 15339: https://bugs.torproject.org/15539. Thanks to a cypherpunk for this workaround idea.

1 0