- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Adding Cooper Quintin's key
by gk＠torproject.org 23 Dec '15

23 Dec '15

commit 77a249124635ee8ac4d62698433aebffa8a1b928 Author: Georg Koppen <gk(a)torproject.org> Date: Wed Dec 23 08:03:04 2015 +0000 Adding Cooper Quintin's key --- gitian/gpg/https-everywhere.gpg | Bin 112546 -> 188424 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/gitian/gpg/https-everywhere.gpg b/gitian/gpg/https-everywhere.gpg index 96a2f45..43aa4e4 100644 Binary files a/gitian/gpg/https-everywhere.gpg and b/gitian/gpg/https-everywhere.gpg differ

1 0

[tor-browser-bundle/hardened-builds] Bug 17875: Discourage editing of torrc-defaults.
by gk＠torproject.org 21 Dec '15

21 Dec '15

commit ac11a0c9cd84d0287ae85fb7357e55535e11f6a9 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Dec 21 12:03:13 2015 -0500 Bug 17875: Discourage editing of torrc-defaults. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 6 ++++++ Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 6 ++++++ Bundle-Data/windows/Data/Tor/torrc-defaults | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity]

1 0

[tor-browser-bundle/maint-5.0] Bug 17875: Discourage editing of torrc-defaults.
by gk＠torproject.org 21 Dec '15

21 Dec '15

commit 41b71527e0d64a3b14290a82c96014e663f8b93d Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Dec 21 12:03:13 2015 -0500 Bug 17875: Discourage editing of torrc-defaults. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 6 ++++++ Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 6 ++++++ Bundle-Data/windows/Data/Tor/torrc-defaults | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity]

1 0

[tor-browser-bundle/master] Bug 17875: Discourage editing of torrc-defaults.
by gk＠torproject.org 21 Dec '15

21 Dec '15

commit 940d6ea21668e99619185ef325be39223ffd93ac Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Mon Dec 21 12:03:13 2015 -0500 Bug 17875: Discourage editing of torrc-defaults. --- Bundle-Data/linux/Data/Tor/torrc-defaults | 6 ++++++ Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 6 ++++++ Bundle-Data/windows/Data/Tor/torrc-defaults | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity] diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 4b91aae..0a87e5f 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -1,3 +1,9 @@ +# torrc-defaults for Tor Browser +# +# This file is distributed with Tor Browser and should not be modified (it +# may be overwritten during the next Tor Browser update). To customize your +# Tor configuration, shut down Tor Browser and edit the torrc file. +# # If non-zero, try to write to disk less frequently than we would otherwise. AvoidDiskWrites 1 # Where to send logging messages. Format is minSeverity[-maxSeverity]

1 0

[tor-browser-bundle/maint-5.0] Fix the changelog as intended
by gk＠torproject.org 17 Dec '15

17 Dec '15

commit 9b06ef948b23fa76491f10c160e0ea88aa3d68ce Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 17 12:11:40 2015 +0000 Fix the changelog as intended --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9748d1a..cca1175 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,6 +1,5 @@ Tor Browser 5.0.6 -- December 18 2015 * All Platforms - * Bug 16441: Suppress "Reset Tor Browser" prompt * Bug 17877: Tor Browser 5.0.5 is using the wrong Mozilla build tag Tor Browser 5.0.5 -- December 15 2015

1 0

[tor-browser-bundle/maint-5.0] Revert "Fix bug in changelog"
by gk＠torproject.org 17 Dec '15

17 Dec '15

commit 4833a020e75ca0788adf7a728eaf96102ce24090 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 17 12:10:51 2015 +0000 Revert "Fix bug in changelog" This reverts commit cbc04390e6f35d8e28a7b64572e6ad4bf2415afc. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index b78541e..9748d1a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,7 @@ Tor Browser 5.0.5 -- December 15 2015 * Bug 16863: Avoid confusing error when loop.enabled is false * Bug 17502: Add a preference for hiding "Open with" on download dialog * Bug 17446: Prevent canvas extraction by third parties (fixup of #6253) + * Bug 16441: Suppress "Reset Tor Browser" prompt * Bug 17747: Add ndnop3 as new default obfs4 bridge Tor Browser 5.0.4 -- November 3 2015

1 0

[tor-browser-bundle/maint-5.0] Fix bug in changelog
by gk＠torproject.org 17 Dec '15

17 Dec '15

commit cbc04390e6f35d8e28a7b64572e6ad4bf2415afc Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 17 12:03:37 2015 +0000 Fix bug in changelog --- Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 9748d1a..b78541e 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -21,7 +21,6 @@ Tor Browser 5.0.5 -- December 15 2015 * Bug 16863: Avoid confusing error when loop.enabled is false * Bug 17502: Add a preference for hiding "Open with" on download dialog * Bug 17446: Prevent canvas extraction by third parties (fixup of #6253) - * Bug 16441: Suppress "Reset Tor Browser" prompt * Bug 17747: Add ndnop3 as new default obfs4 bridge Tor Browser 5.0.4 -- November 3 2015

1 0

[tor-browser-bundle/hardened-builds] Using build2 from Mozilla
by gk＠torproject.org 17 Dec '15

17 Dec '15

commit 18db4bba44308ba99cba5a9d82bcfcb4b1473dbd Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 17 10:26:01 2015 +0000 Using build2 from Mozilla --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 511ea05..a7d03c9 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -15,7 +15,7 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=hardened -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.8.1 TORBUTTON_TAG=1.9.4.2 @@ -46,7 +46,7 @@ GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.2.0 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/master] Using build2 from Mozilla
by gk＠torproject.org 17 Dec '15

17 Dec '15

commit 30c14b7fdd1a0527ca82b80a7cc121f386653ab4 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 17 09:13:08 2015 +0000 Using build2 from Mozilla --- gitian/versions.alpha | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 2691a1d..d1c9f36 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -11,7 +11,7 @@ FIREFOX_VERSION=38.5.0esr TORBROWSER_UPDATE_CHANNEL=alpha -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1 TOR_TAG=tor-0.2.7.6 TORLAUNCHER_TAG=0.2.7.7 TORBUTTON_TAG=1.9.4.2 @@ -42,7 +42,7 @@ GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux OPENSSL_VER=1.0.1q GMP_VER=5.1.3 FIREFOX_LANG_VER=$FIREFOX_VERSION -FIREFOX_LANG_BUILD=build1 +FIREFOX_LANG_BUILD=build2 BINUTILS_VER=2.24 GCC_VER=5.1.0 PYTHON_VER=2.7.5

1 0

[tor-browser-bundle/maint-5.0] Update Changelog
by gk＠torproject.org 17 Dec '15

17 Dec '15

commit 807dd4984e76fae17d6f165f8a35408f4ee056b6 Author: Georg Koppen <gk(a)torproject.org> Date: Thu Dec 17 09:00:28 2015 +0000 Update Changelog --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 222f31c..9748d1a 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 5.0.6 -- December 18 2015 + * All Platforms + * Bug 16441: Suppress "Reset Tor Browser" prompt + * Bug 17877: Tor Browser 5.0.5 is using the wrong Mozilla build tag + Tor Browser 5.0.5 -- December 15 2015 * All Platforms * Update Firefox to 38.5.0esr

1 0