- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 33685: Add Support for Building zlib for Android
by boklm＠torproject.org 15 Apr '20

15 Apr '20

commit cc6e1439cdc0bc393ce7c3c2ece47cc2d9abed4f Author: sisbell <shane.isbell(a)gmail.com> Date: Sat Mar 21 16:48:11 2020 -0700 Bug 33685: Add Support for Building zlib for Android --- projects/zlib/build | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/projects/zlib/build b/projects/zlib/build index fe1377f..5ee00d5 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -5,8 +5,20 @@ distdir=/var/tmp/dist/[% project %] mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" -make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install +[% IF c("var/windows") -%] + make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" + make BINARY_PATH=$distdir/lib INCLUDE_PATH=$distdir/include LIBRARY_PATH=$distdir/lib -f win32/Makefile.gcc PREFIX=[% c("arch") %]-w64-mingw32- -j[% c("buildconf/num_procs") %] SHARED_MODE=1 LOC="[% c("var/CFLAGS") %] [% c("var/LDFLAGS") %]" install +[% END -%] + +[% IF c("var/android") -%] + export CHOST=[% c("var/configure_host") %] + export CC="clang" + ./configure --prefix=$distdir + make -j[% c("buildconf/num_procs") %] + make -j[% c("buildconf/num_procs") %] install + # Only need static libraries + rm -r $distdir/lib/{*.so*,pkgconfig} +[% END -%] cd /var/tmp/dist [% c('tar', {

1 0

[tor-browser-spec/master] Bug 21952: Onion-Location spec update to match latest implementation
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit fcdbf39dde66f629c7abefb2ab44e36ade55f9ff Author: Alex Catarineu <acat(a)torproject.org> Date: Tue Apr 7 17:22:35 2020 +0200 Bug 21952: Onion-Location spec update to match latest implementation --- proposals/100-onion-location-header.txt | 46 ++++++++++++++++++++++++++++----- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/proposals/100-onion-location-header.txt b/proposals/100-onion-location-header.txt index 0820968..5d0e763 100644 --- a/proposals/100-onion-location-header.txt +++ b/proposals/100-onion-location-header.txt @@ -35,10 +35,8 @@ Ticket: #21952 2.1. Redirection method - We introduce a new HTTP header called "Onion-Location" with the exact same - restrictions and semantics as the Location HTTP header. Websites can use the - Onion-Location HTTP header to specify their onion counterpart, in the same - way that they would use the Location header. + We introduce a new HTTP header called "Onion-Location", which websites + can use to specify their onion counterpart. Example: Onion-Location: http://vwc43ag5jyewlfgf.onion @@ -46,8 +44,29 @@ Ticket: #21952 2.2. Browser logic The Tor Browser intercepts the Onion-Location HTTP header (if any) and - informs the user of the existence of the onion site, giving them the option - to visit it. Tor Browser only does so if the header is served over HTTPS. + acts upon it in two possible ways, depending on the configuration state + of the browser: + + a) If the user has enabled automatic Onion-Location redirects + the header is equivalent to a redirect with a Refresh header and a + timeout of 0 seconds [1]. As an example: the header in 2.1 would be + treated like a `Refresh: 0;URL='http://vwc43ag5jyewlfgf.onion'` header. + + b) If the user has not enabled automatic Onion-Location redirects, + it informs them of the existence of the onionsite, giving them the option + to visit it. If the user chooses to visit the onionsite, the webpage + will be reloaded and redirected to its onion counterpart, as in a). + + Before acting upon it, the browser checks whether the Onion-Location has + a valid value, and ignores it if it does not. For the header to be valid + the following conditions need to be fulfilled: + + * The Onion-Location value must be a valid URL with http: or https: protocol + and a .onion hostname. + + * The webpage defining the Onion-Location header must be served over HTTPS. + + * The webpage defining the Onion-Location header must not be an onionsite. Tor Browser should inform the user about the onion in a non-intrusive way (e.g. an infobar below the address bar), it should also provide a way for @@ -56,6 +75,18 @@ Ticket: #21952 Browsers that don't support Tor SHOULD ignore the Onion-Location header. +2.3. Using an HTML <meta> attribute instead of an HTTP header + + The (conditionally) identical behaviour of Onion-Location and a Refresh + header (with 0 seconds timeout) includes the option of defining it as a + HTML <meta> http-equiv attribute. This may be used by websites that prefer + (or need) to define Onion-Location by modifying the served HTML content + instead of adding a new HTTP header. + + As an example, the Onion-Location header in 2.1 would be equivalent to a + `<meta http-equiv="onion-location" content="http://vwc43ag5jyewlfgf.onion" />` + added in the HTML head element of the webpage. + 3. Drawbacks 3.1. No security/performance benefits @@ -122,3 +153,6 @@ Ticket: #21952 and would still confuse people. So I think starting with a simple approach that will educate users and then moving to more advanced designs is a more normative way to go. + + +[1] https://www.w3.org/TR/2016/NOTE-WCAG20-TECHS-20161007/H76 \ No newline at end of file

1 0

[tor-browser-build/master] Update ChangeLog: add #33630
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit ea9f208259bfe185a35b10cd1e7b9ffd15466ec9 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:47:45 2020 +0000 Update ChangeLog: add #33630 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 1b34667..7f826ee 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 9.5a12 -- April XX 2020 + * All Platforms + Bug 33630: Remove noisebridge01 default bridge + Tor Browser 9.5a11 -- April 8 2020 * All Platforms * Update Firefox to 68.7.0esr

1 0

[tor-browser-build/master] Revert "Revert "Bug 33630: Remove noisebridge01 default bridge.""
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit 121d6597d436e94b92928f39fade8eb2067e6047 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:45:04 2020 +0000 Revert "Revert "Bug 33630: Remove noisebridge01 default bridge."" This reverts commit ac8641d245dadc64f0057231f9e593379e9701fc. --- .../tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index a87aa58..282e56f 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -9,15 +9,14 @@ pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.240.34:40035 pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Revert "Revert "Bug 33630: Pick up tor-android-service patch""
by sysrqb＠torproject.org 15 Apr '20

15 Apr '20

commit 66d52da6b8b6fccdadc926b85a49109f15ef00ab Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Apr 15 12:45:16 2020 +0000 Revert "Revert "Bug 33630: Pick up tor-android-service patch"" This reverts commit 8c408b55345aec7af1be95d722e115df3f877beb. --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index c2994b7..9754ebe 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 +git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Bug 33877: Disable Samples and Regression tests For Libevent Build
by boklm＠torproject.org 14 Apr '20

14 Apr '20

commit f4792f507d57583fce4f52afcb927076762653a1 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Mar 1 16:08:28 2020 -0800 Bug 33877: Disable Samples and Regression tests For Libevent Build --- projects/libevent/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/libevent/build b/projects/libevent/build index 1d620d9..fe15e8e 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END -%] ./autogen.sh -./configure --disable-static [% c("var/configure_opt") %] --prefix=$distdir +./configure --disable-static [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]"

1 0

[tor-browser-build/master] Bug 28765: LibEvent Build for Android
by boklm＠torproject.org 14 Apr '20

14 Apr '20

commit 06bb0f2d4c91d7ac60ae180297d3c0707a004199 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Mar 1 16:08:28 2020 -0800 Bug 28765: LibEvent Build for Android --- projects/libevent/build | 2 +- projects/libevent/config | 4 ++++ rbm.conf | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/projects/libevent/build b/projects/libevent/build index fe15e8e..9c4f190 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -11,7 +11,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] [% END -%] ./autogen.sh -./configure --disable-static [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir +./configure [% c("var/configure_opt") %] --disable-libevent-regress --disable-samples --prefix=$distdir [% IF c("var/osx") -%] export LD_PRELOAD=[% c("var/faketime_path") %] export FAKETIME="[% USE date; GET date.format(c('timestamp'), format = '%Y-%m-%d %H:%M:%S') %]" diff --git a/projects/libevent/config b/projects/libevent/config index fa01c1c..2e5dee6 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -9,12 +9,16 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: container: use_container: 1 + configure_opt_project: --disable-static targets: osx-x86_64: var: arch_deps: - faketime + android: + var: + configure_opt_project: --disable-shared input_files: - project: container-image diff --git a/rbm.conf b/rbm.conf index a988c89..cd17da9 100644 --- a/rbm.conf +++ b/rbm.conf @@ -289,12 +289,12 @@ targets: var: linux-i686: 1 osname: linux-i686 - configure_opt_i686: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32' - configure_opt: '[% c("var/configure_opt_i686") %]' + configure_opt: '--host=i686-linux-gnu CFLAGS=-m32 CXXFLAGS=-m32 LDFLAGS=-m32 [% c("var/configure_opt_project") %]' linux: var: linux: 1 compiler: gcc + configure_opt: '[% c("var/configure_opt_project") %]' # We only build snowflake on the alpha and nightly # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' @@ -343,7 +343,7 @@ targets: container: suite: stretch arch: amd64 - configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"' + configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]" [% c("var/configure_opt_project") %]' CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]' LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]' flag_mwindows: '-mwindows' @@ -372,7 +372,7 @@ targets: suite: stretch arch: amd64 compiler: 'macosx-toolchain' - configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"' + configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]" [% c("var/configure_opt_project") %]' FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir" LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie" macosx_deployment_target: '10.9'

1 0

[tor-browser-build/master] Merge remote-tracking branch 'sisbell/bug-31499d'
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit a017df805383561dde058f566255d709bc347834 Merge: 1557510 bb2d411 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 18:25:28 2020 +0200 Merge remote-tracking branch 'sisbell/bug-31499d' projects/libevent/autotools-openssl-mac.patch | 26 -------------------------- projects/libevent/build | 1 - projects/libevent/config | 4 +--- projects/tor/build | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-)

1 0

[tor-browser-build/master] Bug 31499: Update libevent to 2.1.11-stable
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit bb2d411f379c7b866dadc3d0ef18ce827c8d5260 Author: sisbell <shane.isbell(a)gmail.com> Date: Sun Mar 1 15:58:00 2020 -0800 Bug 31499: Update libevent to 2.1.11-stable --- projects/libevent/autotools-openssl-mac.patch | 26 -------------------------- projects/libevent/build | 1 - projects/libevent/config | 4 +--- projects/tor/build | 2 +- 4 files changed, 2 insertions(+), 31 deletions(-) diff --git a/projects/libevent/autotools-openssl-mac.patch b/projects/libevent/autotools-openssl-mac.patch deleted file mode 100644 index 1ee2964..0000000 --- a/projects/libevent/autotools-openssl-mac.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 506df426dbeb0187bbd3654bd286b4100628fb16 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas(a)gmail.com> -Date: Tue, 29 Aug 2017 00:44:57 -0700 -Subject: [PATCH] autotools: confirm openssl is working before using - -latest versions of macOS provide pkg-config and libraries for an ancient -version of openssl as part of the system, but no headers - -diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4 -index c2040595..7b458134 100644 ---- a/m4/libevent_openssl.m4 -+++ b/m4/libevent_openssl.m4 -@@ -39,6 +39,10 @@ case "$enable_openssl" in - done - ;; - esac -+ CPPFLAGS_SAVE=$CPPFLAGS -+ CPPFLAGS+=$OPENSSL_INCS -+ AC_CHECK_HEADERS([openssl/ssl.h], [], [have_openssl=no]) -+ CPPFLAGS=$CPPFLAGS_SAVE - AC_SUBST(OPENSSL_INCS) - AC_SUBST(OPENSSL_LIBS) - case "$have_openssl" in --- -2.17.0 - diff --git a/projects/libevent/build b/projects/libevent/build index de9ba80..1d620d9 100644 --- a/projects/libevent/build +++ b/projects/libevent/build @@ -6,7 +6,6 @@ mkdir -p /var/tmp/build tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz cd /var/tmp/build/[% project %]-[% c('version') %] [% IF c("var/osx") -%] - patch -p1 < $rootdir/autotools-openssl-mac.patch # Setting this after `configure` but before `make` might be enough, but let's # not bet on that and just set it here. export MACOSX_DEPLOYMENT_TARGET=[% c("var/macosx_deployment_target") %] diff --git a/projects/libevent/config b/projects/libevent/config index 386f746..fa01c1c 100644 --- a/projects/libevent/config +++ b/projects/libevent/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.8 +version: 2.1.11 git_url: https://github.com/libevent/libevent.git git_hash: 'release-[% c("version") %]-stable' tag_gpg_id: 1 @@ -20,5 +20,3 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - filename: autotools-openssl-mac.patch - enable: '[% c("var/osx") %]' diff --git a/projects/tor/build b/projects/tor/build index 2d10fb3..0235da7 100644 --- a/projects/tor/build +++ b/projects/tor/build @@ -54,7 +54,7 @@ openssldir=/var/tmp/dist/openssl/openssl mkdir -p "$distdir/Debug/Tor" cp $openssldir/lib/libssl.so.1.1 "$distdir/Tor/" cp $openssldir/lib/libcrypto.so.1.1 "$distdir/Tor/" - cp $libeventdir/lib/libevent-2.1.so.6 "$distdir/Tor/" + cp $libeventdir/lib/libevent-2.1.so.7 "$distdir/Tor/" # We need to copy the libstdc++.so.6 for Tor Browser on older Linux distros. # Copying it into /Browser, which feels more natural, and amending # LD_LIBRARY_PATH breaks updates from a Tor Browser with the old

1 0

[tor-browser-build/master] Add 9.5a10 ChangeLog
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 3296c9e14bb7551f4f12763f8992e632f80b0887 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 15:52:26 2020 +0200 Add 9.5a10 ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 93999a3..9026f19 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,6 +21,11 @@ Tor Browser 9.5a11 -- April 8 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.5a10 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.5a9 -- March 25 2020 * All Platforms * Translations update

1 0

[tor-browser-build/master] Fold in stable changelog for 9.0.8 and 9.0.9
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 155751006dfe77e0215ad016ed41a3231e96175a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 15:53:44 2020 +0200 Fold in stable changelog for 9.0.8 and 9.0.9 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9026f19..1b34667 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -21,11 +21,27 @@ Tor Browser 9.5a11 -- April 8 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.0.9 -- April 7 2020 + * All Platforms + * Update Firefox to 68.7.0esr + * Bump NoScript to 11.0.23 + * Bug 33630: Remove noisebridge01 default bridge + * Windows + OS X + Linux + * Bug 33771: Update some existing licenses and add Libevent license + * Bug 33723: Bump openssl version to 1.1.1f + * Windows + * Bug 33805: Remove escape-openssldir.patch + Tor Browser 9.5a10 -- April 5 2020 * All Platforms * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly * Mozilla Bug 1626728 - Normalize shutdown +Tor Browser 9.0.8 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.5a9 -- March 25 2020 * All Platforms * Translations update

1 0

[tor-browser-build/maint-9.0] Add 9.0.8 ChangeLog
by boklm＠torproject.org 10 Apr '20

10 Apr '20

commit 36d601c965a000a15c13ee40573cca9e754de69a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Apr 10 14:44:24 2020 +0200 Add 9.0.8 ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 00e36da..7e24574 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -9,6 +9,11 @@ Tor Browser 9.0.9 -- April 7 2020 * Windows * Bug 33805: Remove escape-openssldir.patch +Tor Browser 9.0.8 -- April 5 2020 + * All Platforms + * Mozilla Bug 1620818 - Release nsDocShell::mContentViewer properly + * Mozilla Bug 1626728 - Normalize shutdown + Tor Browser 9.0.7 -- March 20 2020 * All Platforms * Bump NoScript to 11.0.19

1 0

[tor-browser-build/master] Bug 33749: stemns: Bump stem to 1.8.0
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit d84dcbad93df0427467fb3c63bfef09d1e30eee6 Author: JeremyRand <jeremyrand(a)airmail.cc> Date: Fri Mar 27 09:33:03 2020 +0000 Bug 33749: stemns: Bump stem to 1.8.0 This pulls in the fix for Bug 30882 --- projects/stemns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/stemns/config b/projects/stemns/config index 6c83335..df2ac5c 100644 --- a/projects/stemns/config +++ b/projects/stemns/config @@ -6,12 +6,12 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: container: use_container: 1 - stem-version: 1.7.1 + stem-version: 1.8.0 input_files: - project: container-image - URL: 'https://files.pythonhosted.org/packages/source/s/stem/stem-[% c("var/stem-version") %].tar.gz' - sha256sum: c9eaf3116cb60c15995cbd3dec3a5cbc50e9bb6e062c4d6d42201e566f498ca2 + sha256sum: a0b48ea6224e95f22aa34c0bc3415f0eb4667ddeae3dfb5e32a6920c185568c2 # TODO: This sha256sum was grabbed from PyPI and hasn't been verified. We should probably switch to using an OpenPGP sig. - filename: settings_port.py - filename: settings_services.py

1 0

[tor-browser-build/master] Merge remote-tracking branch 'JeremyRand/stem-1.8.0'
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit 026dd67289580ff00b31f6c7c26328a9d2ecefed Merge: 44a18de d84dcba Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:48:52 2020 +0200 Merge remote-tracking branch 'JeremyRand/stem-1.8.0' projects/stemns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'acat/33845_fix_patch'
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit ba31ac419a33126882c45c94923614a555e80284 Merge: 4b9ad6d d3a7505 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:42:25 2020 +0200 Merge remote-tracking branch 'acat/33845_fix_patch' projects/firefox/namecoin-torbutton.patch | 75 ++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 17 deletions(-)

1 0

[tor-browser-build/master] Bug 33845: Rebase namecoin torbutton patch
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit d3a750533fbc28e9e80cce5311bbf79a3f58db21 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 8 21:33:14 2020 +0200 Bug 33845: Rebase namecoin torbutton patch --- projects/firefox/namecoin-torbutton.patch | 75 ++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/projects/firefox/namecoin-torbutton.patch b/projects/firefox/namecoin-torbutton.patch index 11cf7a1..5649ee6 100644 --- a/projects/firefox/namecoin-torbutton.patch +++ b/projects/firefox/namecoin-torbutton.patch @@ -1,8 +1,8 @@ diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js -index 5ecbe7d..f771150 100644 +index 119f6fca..477b0302 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js -@@ -49,7 +49,11 @@ let credentialsToNodeDataMap = new Map(), +@@ -48,7 +48,11 @@ let credentialsToNodeDataMap = new Map(), knownCircuitIDs = new Map(), // A mutable map that records the SOCKS credentials for the // latest channels for each browser + domain. @@ -15,7 +15,7 @@ index 5ecbe7d..f771150 100644 // __trimQuotes(s)__. // Removes quotation marks around a quoted string. -@@ -126,6 +130,28 @@ let getCircuitStatusByID = async function (aController, circuitID) { +@@ -132,6 +136,28 @@ let getCircuitStatusByID = async function (aController, circuitID) { return null; }; @@ -44,7 +44,7 @@ index 5ecbe7d..f771150 100644 // __collectIsolationData(aController, updateUI)__. // Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then // we assume isolation settings (SOCKS username+password) are now fixed for the -@@ -139,6 +165,15 @@ let collectIsolationData = function (aController, updateUI) { +@@ -145,6 +171,15 @@ let collectIsolationData = function (aController, updateUI) { "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", async (streamEvent) => { @@ -52,7 +52,7 @@ index 5ecbe7d..f771150 100644 + // Collect any stream target that might be an onion. + if (streamEvent && streamEvent.StreamID && streamEvent.Target) { + let targetDomain = streamEvent.Target.split(":")[0]; -+ if (targetDomain.endsWith(".onion")) { ++ if (targetDomain.endsWith(".onion")) { + bitToOnionMap[bitTargets[streamEvent.StreamID]] = targetDomain; + logger.eclog(3, "mapped " + bitTargets[streamEvent.StreamID] + " to " + targetDomain); + } @@ -60,10 +60,10 @@ index 5ecbe7d..f771150 100644 if (!knownCircuitIDs.get(streamEvent.CircuitID)) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs.set(streamEvent.CircuitID, true); -@@ -306,12 +341,14 @@ let updateCircuitDisplay = function () { - (i === 0 && nodeData[0].type !== "bridge") ? - ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); +@@ -312,7 +347,9 @@ let updateCircuitDisplay = function () { } + + let domainParts = []; - if (domain.endsWith(".onion")) { + logger.eclog(3, "bit to onion map:" + JSON.stringify(bitToOnionMap) + ", domain: " + domain); + let mappedOnion = bitToOnionMap[domain]; @@ -71,13 +71,54 @@ index 5ecbe7d..f771150 100644 for (let i = 0; i < 3; ++i) { li(uiString("relay")); } +@@ -325,24 +362,28 @@ let updateCircuitDisplay = function () { + domainParts.push(domain); } -- li(domain); -+ li(domain, " ", mappedOnion ? ["span", { class: "circuit-ip-address" }, mappedOnion] : null); + +- // We use a XUL html:span element so that the tooltiptext is displayed. +- li([ +- "html:span", +- { +- class: "circuit-onion", +- onclick: ` +- this.classList.add("circuit-onion-copied"); +- Cc[ +- "@mozilla.org/widget/clipboardhelper;1" +- ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) +- `, +- "data-onion": domain, +- "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), +- "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), +- tooltiptext: domain, +- }, +- ...domainParts, +- ]); ++ if (mappedOnion) { ++ li(domain, " ", ["span", { class: "circuit-ip-address" }, mappedOnion]); ++ } else { ++ // We use a XUL html:span element so that the tooltiptext is displayed. ++ li([ ++ "html:span", ++ { ++ class: "circuit-onion", ++ onclick: ` ++ this.classList.add("circuit-onion-copied"); ++ Cc[ ++ "@mozilla.org/widget/clipboardhelper;1" ++ ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) ++ `, ++ "data-onion": domain, ++ "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), ++ "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), ++ tooltiptext: domain, ++ }, ++ ...domainParts, ++ ]); ++ } + // Hide the note about guards if we are using a bridge. document.getElementById("circuit-guard-note-container").style.display = - (nodeData[0].type === "bridge") ? "none" : "block"; -@@ -418,6 +455,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -450,6 +491,7 @@ let setupDisplay = function (enablePrefName) { stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, stopEnsuringCorrectPopupDimensions = null, @@ -85,17 +126,17 @@ index 5ecbe7d..f771150 100644 stop = function() { syncDisplayWithSelectedTab(false); if (myController) { -@@ -430,6 +468,9 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -462,6 +504,9 @@ let setupDisplay = function (enablePrefName) { if (stopEnsuringCorrectPopupDimensions) { stopEnsuringCorrectPopupDimensions(); } -+ if (stopCollectingBitTargets) { -+ stopCollectingBitTargets(); -+ } ++ if (stopCollectingBitTargets) { ++ stopCollectingBitTargets(); ++ } myController = null; } }, -@@ -444,6 +485,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -475,6 +520,7 @@ let setupDisplay = function (enablePrefName) { stop(); }); syncDisplayWithSelectedTab(true);

1 0

[tor-browser-build/master] Revert "Bug 33845: Disable Namecoin on nightly temporarily"
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit 44a18de3b88d80f6841e21903896a5f957ca8e63 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:42:48 2020 +0200 Revert "Bug 33845: Disable Namecoin on nightly temporarily" This reverts commit 4b9ad6d76f322fc83b9e8fb5751b95662a0b85ce. --- rbm.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index a59aacb..a988c89 100644 --- a/rbm.conf +++ b/rbm.conf @@ -299,8 +299,7 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' # Only build Namecoin for linux on nightly - # Namecoin is temporarily disabled on nightly until #33845 is fixed. - namecoin: 0 + namecoin: '[% c("var/nightly") %]' container: suite: wheezy arch: amd64

1 0

[tor-browser-build/master] Bug 33845: Disable Namecoin on nightly temporarily
by boklm＠torproject.org 08 Apr '20

08 Apr '20

commit 4b9ad6d76f322fc83b9e8fb5751b95662a0b85ce Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 8 17:22:20 2020 +0200 Bug 33845: Disable Namecoin on nightly temporarily Namecoin support is temporarily disabled, until projects/firefox/namecoin-torbutton.patch is rebased. --- rbm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index a988c89..a59aacb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -299,7 +299,8 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' # Only build Namecoin for linux on nightly - namecoin: '[% c("var/nightly") %]' + # Namecoin is temporarily disabled on nightly until #33845 is fixed. + namecoin: 0 container: suite: wheezy arch: amd64

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmtpo/bug_33807_v2'
by sysrqb＠torproject.org 07 Apr '20

07 Apr '20

commit 5a2948b7195d1daa2b73b3cef2ed5507a922a76e Merge: 54fd8bc 65a1aca Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 7 01:33:42 2020 +0000 Merge remote-tracking branch 'boklmtpo/bug_33807_v2' projects/firefox/namecoin-etld.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 33807: Rebase namecoin firefox patch
by sysrqb＠torproject.org 07 Apr '20

07 Apr '20

commit 65a1aca6a618016afd97ec4b956ba58014db9051 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 5 17:48:04 2020 +0200 Bug 33807: Rebase namecoin firefox patch --- projects/firefox/namecoin-etld.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/firefox/namecoin-etld.patch b/projects/firefox/namecoin-etld.patch index 4a97f99..e2e49a5 100644 --- a/projects/firefox/namecoin-etld.patch +++ b/projects/firefox/namecoin-etld.patch @@ -1,5 +1,5 @@ diff --git a/mobile/android/app/src/main/assets/publicsuffixlist b/mobile/android/app/src/main/assets/publicsuffixlist -index 7f834b1..6874b40 100644 +index 7f834b1a89bd..6874b4005ae3 100644 --- a/mobile/android/app/src/main/assets/publicsuffixlist +++ b/mobile/android/app/src/main/assets/publicsuffixlist @@ -3005,6 +3005,8 @@ edu.mn @@ -12,13 +12,13 @@ index 7f834b1..6874b40 100644 vision eurovision diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat -index 9dd962a..3402b20 100644 +index 0c53819d860d..469fb3d53ba1 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat -@@ -5480,6 +5480,7 @@ pro.om - - // onion : https://tools.ietf.org/html/rfc7686 +@@ -5497,6 +5497,7 @@ pro.om onion + tor.onion + securedrop.tor.onion +bit.onion // org : https://en.wikipedia.org/wiki/.org

1 0

[tor-browser-build/master] Fix #33821 and tag -build2
by sysrqb＠torproject.org 05 Apr '20

05 Apr '20

commit 54fd8bc84945088600e7f039e9a341db37697593 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Apr 5 22:45:02 2020 +0000 Fix #33821 and tag -build2 --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 02b1908..f03c110 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # 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") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 564dff4..a988c89 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a11' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a9 - 9.5a10

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 05 Apr '20

05 Apr '20

commit e09b2deb216910b26f1ade5882d3c3c07af30652 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Apr 5 22:34:53 2020 +0000 fixup! Bug 28005: Implement .onion alias urlbar rewrites --- browser/components/onionservices/moz.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/onionservices/moz.build b/browser/components/onionservices/moz.build index e4c63a6ebcb9..dfd664df434e 100644 --- a/browser/components/onionservices/moz.build +++ b/browser/components/onionservices/moz.build @@ -1,9 +1,9 @@ JAR_MANIFESTS += ['jar.mn'] EXTRA_JS_MODULES += [ - 'OnionLocationChild.jsm', - 'OnionLocationParent.jsm', 'ExtensionMessaging.jsm', 'HttpsEverywhereControl.jsm', 'OnionAliasStore.jsm', + 'OnionLocationChild.jsm', + 'OnionLocationParent.jsm', ]

1 0

[tor-browser-build/master] Revert "Bug 33630: Pick up tor-android-service patch"
by sysrqb＠torproject.org 05 Apr '20

05 Apr '20

commit 8c408b55345aec7af1be95d722e115df3f877beb Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Apr 5 15:51:50 2020 +0000 Revert "Bug 33630: Pick up tor-android-service patch" This reverts commit 3636417054f1e739a3a26bbacadbcd252c5a14c2. --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 9754ebe..c2994b7 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a +git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0

[tor-browser-build/master] Revert "Bug 33630: Remove noisebridge01 default bridge."
by sysrqb＠torproject.org 05 Apr '20

05 Apr '20

commit ac8641d245dadc64f0057231f9e593379e9701fc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Apr 5 15:51:52 2020 +0000 Revert "Bug 33630: Remove noisebridge01 default bridge." This reverts commit d479aea502e0ad734f7b31549bdb41a8d20d3251. --- .../tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js index 282e56f..a87aa58 100644 --- a/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js +++ b/projects/tor-browser/Bundle-Data/PTConfigs/bridge_prefs.js @@ -9,14 +9,15 @@ pref("extensions.torlauncher.default_bridge.obfs4.4", "obfs4 37.218.240.34:40035 pref("extensions.torlauncher.default_bridge.obfs4.5", "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.6", "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0"); pref("extensions.torlauncher.default_bridge.obfs4.7", "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); -pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.8", "obfs4 216.252.162.21:46089 0DB8799466902192B6C7576D58D4F7F714EC87C1 cert=XPUwcQPxEXExHfJYX58gZXN7mYpos7VNAHbkgERNFg+FCVNzuYo1Wp+uMscl3aR9hO2DRQ iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.9", "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.10", "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.11", "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.12", "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.13", "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.14", "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.15", "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); +pref("extensions.torlauncher.default_bridge.obfs4.16", "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0"); pref("extensions.torlauncher.default_bridge.meek-azure.1", "meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com");

1 0

[tor-browser-build/master] Revert "Update ChangeLog: add #33630"
by sysrqb＠torproject.org 05 Apr '20

05 Apr '20

commit 4953bc11ef4394ce68a10ea0e015143af2119f72 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Apr 5 15:51:51 2020 +0000 Revert "Update ChangeLog: add #33630" This reverts commit 09f6699019e6611624cf643ad003791c2d5280ec. --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4e869b4..93999a3 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -6,7 +6,6 @@ Tor Browser 9.5a11 -- April 8 2020 * Translations update * Bug 33342: Avoid disconnect search addon error after removal * Bug 33482: Update about:tor donate string - * Bug 33630: Remove noisebridge01 default bridge * Android * Translations update * Windows + OS X + Linux

1 0