- tor-commits - lists.torproject.org

[builders/tor-browser-build] branch maint-11.0 updated: Bug 40470: Fix zlib build issue for android
by gitolite role 06 Apr '22

06 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch maint-11.0 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.0 by this push: new 1878b8f Bug 40470: Fix zlib build issue for android 1878b8f is described below commit 1878b8fc06f3aa1771d23eceb191551be0ce8016 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Apr 4 11:14:25 2022 +0200 Bug 40470: Fix zlib build issue for android https://github.com/madler/zlib/issues/608 --- ...re-issue-that-discarded-provided-CC-defin.patch | 24 ++++++++++++++++++++++ projects/zlib/build | 4 ++++ projects/zlib/config | 1 + 3 files changed, 29 insertions(+) diff --git a/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch b/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch new file mode 100644 index 0000000..3aa91b2 --- /dev/null +++ b/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch @@ -0,0 +1,24 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler(a)alumni.caltech.edu> +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a0..3fa3e86 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/projects/zlib/build b/projects/zlib/build index 25f31f5..943a895 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -5,6 +5,10 @@ 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') %] + +# Fix for tor-browser-build#40470 +patch -p1 < $rootdir/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch + [% 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 diff --git a/projects/zlib/config b/projects/zlib/config index e6d550a..957ef6d 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -15,3 +15,4 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - filename: 0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40470: Fix zlib build issue for android
by gitolite role 06 Apr '22

06 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new 136dcf4 Bug 40470: Fix zlib build issue for android 136dcf4 is described below commit 136dcf4b025c9bae69e214d8ed08a73d19492dc4 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Mon Apr 4 11:14:25 2022 +0200 Bug 40470: Fix zlib build issue for android https://github.com/madler/zlib/issues/608 --- ...re-issue-that-discarded-provided-CC-defin.patch | 24 ++++++++++++++++++++++ projects/zlib/build | 4 ++++ projects/zlib/config | 1 + 3 files changed, 29 insertions(+) diff --git a/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch b/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch new file mode 100644 index 0000000..3aa91b2 --- /dev/null +++ b/projects/zlib/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch @@ -0,0 +1,24 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler <madler(a)alumni.caltech.edu> +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a0..3fa3e86 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in diff --git a/projects/zlib/build b/projects/zlib/build index 25f31f5..943a895 100644 --- a/projects/zlib/build +++ b/projects/zlib/build @@ -5,6 +5,10 @@ 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') %] + +# Fix for tor-browser-build#40470 +patch -p1 < $rootdir/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch + [% 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 diff --git a/projects/zlib/config b/projects/zlib/config index e6d550a..957ef6d 100644 --- a/projects/zlib/config +++ b/projects/zlib/config @@ -15,3 +15,4 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' + - filename: 0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] annotated tag tbb-11.5a9-build1 created (now 35d46db)
by gitolite role 06 Apr '22

06 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tbb-11.5a9-build1 in repository builders/tor-browser-build. at 35d46db (tag) tagging cc80ab28dbe4e1497ae21ed38812f95dc38320c2 (commit) replaces tbb-11.5a8-build2 by Richard Pospesel on Wed Apr 6 18:14:38 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 11.5a9 -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmJN2I4XHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSyz/3A//dUpE1Udj8nb+P5xSrAtr3dhm S3tNWK/w+xjFD/Oje7EpLq0xaNYI12/MTc/5gQzzTaXH3DYdZ6j27RUKjkRg3m2J ngIjE9guAsTNEmtwYYSZjLWwhtD0jo/n56iSQPXxJ8DcqnISYRVPYs+SSn9kXUOD iWe59QZQTlU1oELedw8lKy8672Rdui2lVZhN8jI2CFFDWbN6VoRRLgsjgDhYCuC7 GHWG30eOzBZQpizddMrM51pPM3fsyBe/O6+SaXsuixMHdiCaMDNI5yqG8kEN3PaT zl7FRigOdyogp2harH7Om2CdruNjWvC3konaagfDTMWx3usqWWISJgpx7r6be0R0 d47uAFpZiobnDHbnYQvRfKu1OK8BPGe5M6PJMEHVR9DVryghCZtSmymT3APEYfjU 6ohz0TS9tHKhGb41L/dYUe4BSqu/yYN0CNGhSfDxijgYYjD630NKSY+fTpCffHHC lwODMcRDqdKLcbv/S6vjCOxfId3iI8lnSzNyPla3qaC6/ufg03RSEvhUyeseP1hx hH6gq8t0Xbzwf7+PvA3Z8DVchiPv+MMzOqZJxS9mWgPZ6g8B1mh0y+AQ5Y/O01Kl +gfVEqT4R+7vzcKDw5HSz4HNja9rMwD4ctttxTa18m4vRCRJJpnxRGeYPdK41b52 Vn/RWiie/atQ8qHqnOQ= =wQwb -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch master updated: Bug 40458: Prepare alpha release 11.5a9 (Desktop)
by gitolite role 06 Apr '22

06 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch master in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/master by this push: new cc80ab2 Bug 40458: Prepare alpha release 11.5a9 (Desktop) cc80ab2 is described below commit cc80ab28dbe4e1497ae21ed38812f95dc38320c2 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Apr 5 21:47:00 2022 +0000 Bug 40458: Prepare alpha release 11.5a9 (Desktop) --- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 14 ++++++++++++++ projects/tor-browser/config | 4 ++-- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- rbm.conf | 6 +++--- 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index 7ca3e21..f823f7c 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # 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-build5' +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 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 91.7.0 + firefox_platform_version: 91.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 11.5 branding_directory: 'browser/branding/alpha' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 9e594e9..32e7680 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,16 @@ +Tor Browser 11.5a9 - April 12 2022 +* Windows + OS X + Linux + * Update Firefox to 91.8.0esr + * Update NoScript to 11.4.4 + * Update Tor Launcher 0.2.34 + * Update Tor to 0.4.7.5-alpha + * Bug 34366: The onion-location mechanism does not redirect to full URL [tor-browser] + * Bug 40469: Update zlib to 1.2.12 (CVE-2018-25032) [tor-browser-build] + * Bug 40773: Update the about:torconnect frontend page to match additional UI flows [tor-browser] + * Bug 40774: Update about:preferences page to match new UI designs [tor-browser] + * Bug 40822: Rebase tor-browser 11.5a9 to 91.8 Firefox [tor-browser] + * Bug 40862: Backport 1760674 [tor-browser] + Tor Browser 11.5a8 - March 15 2022 * Windows + OS X + Linux * Bug 14939: Support ipv6 addresses in Tor Circuit Display [tor-browser] @@ -15,6 +28,7 @@ Tor Browser 11.5a7 - March 9 2022 Tor Browser 11.5a6 - March 8 2022 * Windows + OS X + Linux + * Update Firefox to 91.7.0esr * Update Tor to 0.4.7.4-alpha * Update NoScript to 11.3.7 * Bug 19850: Disable Plaintext HTTP Clearnet Connections [tor-browser] diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 453c752..d152e59 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -78,9 +78,9 @@ input_files: enable: '[% ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - - URL: https://addons.mozilla.org/firefox/downloads/file/3916177/noscript_security… + - URL: https://addons.mozilla.org/firefox/downloads/file/3930315/noscript_security… name: noscript - sha256sum: 6e5af18ce46bfc496fb027581d3d37a0edb95df158d053a5d9a1f89b8093bc49 + sha256sum: 925fc2fadb017bab3ed1abf9c9fde705f5ac03e64ce19b3b1b3f20407cd1de31 - filename: 'RelativeLink/start-tor-browser.desktop' enable: '[% c("var/linux") %]' - filename: 'RelativeLink/execdesktop' diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index 5e9a426..a730893 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.33 +version: 0.2.34 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/projects/tor/config b/projects/tor/config index c04bbe5..49ec24a 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.4.7.4-alpha +version: 0.4.7.5-alpha git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index fe6c346..37b95e2 100644 --- a/rbm.conf +++ b/rbm.conf @@ -58,10 +58,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '11.5a8' - torbrowser_build: 'build2' + torbrowser_version: '11.5a9' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 11.5a6 + - 11.5a8 project_name: tor-browser multi_lingual: 0 build_mar: 1 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-launcher] annotated tag 0.2.34 created (now b509cfc)
by gitolite role 05 Apr '22

05 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag 0.2.34 in repository tor-launcher. at b509cfc (tag) tagging abd6b8986180e4f14bb8f17d0e57c8a932cafde7 (commit) replaces 0.2.33 by Richard Pospesel on Tue Apr 5 21:26:38 2022 +0000 - Log ----------------------------------------------------------------- Tagging 0.2.34 -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmJMtCMXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSyyPExAAnEBD1nUbn5P73TS+IfZJZxT9 Msr96+yoEcCbEpIhbvswfGqRA5bXwN2nl8Zq1Vc6EBVNXcKFo06qjUG5m+GaoX/E g++kGdvo9YeQTTqJfkmfapxsZApMwuR2v9fCUakjBmmUVbC247oke5s2wnC4S+zV qvMTAo76kdPrSymQGil2smDz2s8KikTHrVCufQa2KlDmfND93hEpLIyTfF2Jx0R/ KlsK6Ls4bInp5ioSa2EHwkgR4cCFBntLzU/dBDYLzYeNaf5stC5dV7peBZNaa2tr QkA0Cjq1DHG9uVWMxSpBQwuC1FH3LMAQbocLGfrF3AcE3dc3rfYfD5KbZzrdKDVM N0BFW2QA4BQVc5aWOGx3ngM4cvus1D1siTXA21t0pQ6xlsOmyTk5kJExozlNoQz9 4FQaEB5oD7Bkt5cJW2MtjmWvOwb/i1o2nMBnyyFz8KsVFYfQ8HGbjKq8J9xDefg9 QreBDqPomCoZum6F0ZqVNaDNJfC571AMh9fVCJZTAmDkCb4QJ7PfWa0AH4mxbMET lpjoTdupuf31dhRFRepldODsynv4WOEFkpXkbkkeqwBtPsPJ4JtbDd4rbSR1YE76 0HaHnveMh6o7dK984+2OzZW8e2T8YOZeKVdyjX2KEHfCdV9uGrUWPgwdKTdiSVLy 5Swux5ttgXDjAFL4ffU= =d6ck -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-launcher] branch master updated (a1803fc -> abd6b89)
by gitolite role 05 Apr '22

05 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch master in repository tor-launcher. from a1803fc Bug 40823: Revert tor-launcher 5fcd4edb836fcab3db21139e670bddc77811e30c new 1488b0e Bug 40773: Added new localized strings for about:torconnect new 18f3549 Bug 40774: Added new localized strings for about:preferences#connection new abd6b89 Release preparations for 0.2.34 The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: src/chrome/locale/en-US/network-settings.dtd | 97 +++++++++++++++++++++++----- src/install.rdf | 2 +- 2 files changed, 83 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor-browser] annotated tag tor-browser-91.8.0esr-11.5-1-build2 created (now 9536e3aa62619)
by gitolite role 05 Apr '22

05 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tor-browser-91.8.0esr-11.5-1-build2 in repository tor-browser. at 9536e3aa62619 (tag) tagging 623e8a73c697653e0bca3ff5a50b8e8235a1358d (commit) replaces tor-browser-91.8.0esr-11.5-1-build1 by Richard Pospesel on Tue Apr 5 20:40:06 2022 +0000 - Log ----------------------------------------------------------------- Tagging build2 for 91.8esr-based alpha -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmJMqTYXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSywrgw//QDYCfOIw0CdwgCmciZN6u+dd zd+n+lRbkz83q/kiHGde47Vru2Di6e+caapc4HIew9K9FGIkQrHRIxNAxhnqGdhu Uaq0sctX2biCbrzjoTyWgglwOfFVXIMXDVb9dn8bufWYHH8o2gtfS3J6oQtRhqwZ FydJANBjsM10j0RcWoVI15yM+yhvGhfDagZs03uA/W1l5hLfObzLSwod7q6COqKI ohVBb2QKyLcbW3zOwyL0Ybdq9CqnNTsd876HZ4ztkPt1xtYR3x2N/Wl2WkEpjxti 0hg4sX+Ian3aEDBQ7rKZFB19w+Un261cYmPLhOmNodwA3RTw4weBFap16mI3revl H3vtcPmd6pUsoxbdAyw+bywEbY4FDuZ9GXDEQMJDQPwCIPL97TBDsE8czB+jw9ra gM9J5LhUzKZ/B/Le8cA/+IWa8I4vCxNmLO6+CK+VP50/FMzvEAoYgTqmxSmF5zkd uwxdU061nDxJjggSStHJnBpj8WYeDRpwRpwpKBVpZFq+owLmhUbnjOKJyh++IcNs hwtyvDXvffBNMeHQtH17p41cTce+SDsu/YMgyk5QNLK0iNVuxDb3Ty8S7uhe9t7c g8rLInYh49T1HQ/kGDd7mC7T4Zp7VUxmXpGm/PvFEO1DXxTsDAISbLMUxoephvjX xnTDfbP2Owbxz2GzcD0= =snXK -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-91.8.0esr-11.5-1 updated (abc0b7298eddb -> 623e8a73c6976)
by gitolite role 05 Apr '22

05 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-91.8.0esr-11.5-1 in repository tor-browser. from abc0b7298eddb Bug 21952: Implement Onion-Location new d7b8ebd62f4c2 fixup! Add TorStrings module for localization new 3c85de34837cc fixup! Bug 40597: Implement TorSettings module new 207037ff0a0f2 squash! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new 76f70fba50817 squash! Bug 27476: Implement about:torconnect captive portal within Tor Browser new 623e8a73c6976 fixup! Bug 40597: Implement TorSettings module The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/components/preferences/preferences.js | 10 +- browser/components/preferences/preferences.xhtml | 5 +- browser/components/torconnect/TorConnectParent.jsm | 59 +- .../torconnect/content/aboutTorConnect.css | 189 ++- .../torconnect/content/aboutTorConnect.js | 570 +++++++-- .../torconnect/content/aboutTorConnect.xhtml | 43 +- .../components/torconnect/content/arrow-right.svg | 4 + browser/components/torconnect/content/bridge.svg | 5 + .../torconnect/content/connection-failure.svg | 5 + .../torconnect/content/connection-location.svg | 5 + browser/components/torconnect/content/globe.svg | 4 + .../torconnect/content/onion-slash-fillable.svg | 5 + browser/components/torconnect/jar.mn | 6 + .../torpreferences/content/bridgeQrDialog.jsm | 51 + .../torpreferences/content/bridgeQrDialog.xhtml | 23 + .../torpreferences/content/builtinBridgeDialog.jsm | 142 +++ .../content/builtinBridgeDialog.xhtml | 43 + ...gory.inc.xhtml => connectionCategory.inc.xhtml} | 8 +- .../torpreferences/content/connectionPane.js | 1315 ++++++++++++++++++++ .../torpreferences/content/connectionPane.xhtml | 177 +++ .../content/connectionSettingsDialog.jsm | 393 ++++++ .../content/connectionSettingsDialog.xhtml | 62 + .../components/torpreferences/content/network.svg | 0 .../torpreferences/content/provideBridgeDialog.jsm | 69 + .../content/provideBridgeDialog.xhtml | 21 + .../torpreferences/content/requestBridgeDialog.jsm | 32 +- .../content/requestBridgeDialog.xhtml | 10 +- .../torpreferences/content/torLogDialog.jsm | 18 + .../components/torpreferences/content/torPane.js | 940 -------------- .../torpreferences/content/torPane.xhtml | 157 --- .../torpreferences/content/torPreferences.css | 394 +++++- browser/components/torpreferences/jar.mn | 15 +- browser/modules/Moat.jsm | 122 +- browser/modules/TorConnect.jsm | 278 +++-- browser/modules/TorProtocolService.jsm | 100 +- browser/modules/TorSettings.jsm | 139 +-- browser/modules/TorStrings.jsm | 320 ++++- toolkit/modules/RemotePageAccessManager.jsm | 13 +- 38 files changed, 4109 insertions(+), 1643 deletions(-) create mode 100644 browser/components/torconnect/content/arrow-right.svg create mode 100644 browser/components/torconnect/content/bridge.svg create mode 100644 browser/components/torconnect/content/connection-failure.svg create mode 100644 browser/components/torconnect/content/connection-location.svg create mode 100644 browser/components/torconnect/content/globe.svg create mode 100644 browser/components/torconnect/content/onion-slash-fillable.svg create mode 100644 browser/components/torpreferences/content/bridgeQrDialog.jsm create mode 100644 browser/components/torpreferences/content/bridgeQrDialog.xhtml create mode 100644 browser/components/torpreferences/content/builtinBridgeDialog.jsm create mode 100644 browser/components/torpreferences/content/builtinBridgeDialog.xhtml rename browser/components/torpreferences/content/{torCategory.inc.xhtml => connectionCategory.inc.xhtml} (57%) create mode 100644 browser/components/torpreferences/content/connectionPane.js create mode 100644 browser/components/torpreferences/content/connectionPane.xhtml create mode 100644 browser/components/torpreferences/content/connectionSettingsDialog.jsm create mode 100644 browser/components/torpreferences/content/connectionSettingsDialog.xhtml copy toolkit/themes/shared/icons/defaultFavicon.svg => browser/components/torpreferences/content/network.svg (100%) create mode 100644 browser/components/torpreferences/content/provideBridgeDialog.jsm create mode 100644 browser/components/torpreferences/content/provideBridgeDialog.xhtml delete mode 100644 browser/components/torpreferences/content/torPane.js delete mode 100644 browser/components/torpreferences/content/torPane.xhtml -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 5

[tor-browser] annotated tag tor-browser-91.8.0esr-11.5-1-build1 created (now 1c32723e3e347)
by gitolite role 05 Apr '22

05 Apr '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tor-browser-91.8.0esr-11.5-1-build1 in repository tor-browser. at 1c32723e3e347 (tag) tagging abc0b7298eddbcb5cec50d7b411173e763fe95d5 (commit) replaces FIREFOX_91_8_0esr_BUILD1 by Richard Pospesel on Tue Apr 5 16:54:46 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 91.8esr-based alpha -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmJMdGkXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSyw8vg/+PsBuW6pwHu3BgGvWoaQoO13j 2wyQIY6yiSqpglTYZkw0p4sHfzi/Gn0QxZzlrUn8/ddrBgM1xQVtcY4T1f0RAu7j 3IJVlP18aZ2D5+g0+nIDhmuQHxbbye67i0nf2WpQxkxBjA8wq3vaNY5LgeuQDwnM 6kfjpdzrQK0sixmxKoKl7IlxStHHNwe3W6vFI3c/Qd3yhb4hFmjJqgaaQOKrcYGX LDLcxfWVX3LEJNpylmcbNGhYbeZO6r61VADHpdLeHJ8XRnJS7/EXNHMjS2XCgwbu 9jtO1545GN5ZuNzZ5ViR6L0pGpJjYMPiRZfFyUk0Yral7am5ddsVNBRXvgSft+0A MWiv8tZo3gJ+9XPkAVsVWybRvq4x+m057iuCD3R8i0GHpo/PgTGp7t8E0eyApuDx vN+VPmEecnSsvTDqGSVuKTIo0/+6mE3UGvuLNEOi69kYX3/FakXwgNMBtjcAoPDw KIUgBSszhdAaN5NjGZJ0dNK7dfST3wbdCM2Qh4F+mscM0IGnnfx8fMKmjIGk8I2D psRnfAhgscVJqSIl6eG7ExbJd5bjTDaubfA0XejSAOMSajs0eOF1ROXiztHRgwJ3 EkduAV5JOdlcFD9nGo4rpqyYl+zeIXKkXAFfX2du1f+86CW50DAgNBRCDdCtNSEU p5jipaJ2c2LT9GKmiF4= =ly0I -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake] branch main updated: Represent fingerprint internally as byte array
by gitolite role 05 Apr '22

05 Apr '22

This is an automated email from the git hooks/post-receive script. arlo pushed a commit to branch main in repository pluggable-transports/snowflake. The following commit(s) were added to refs/heads/main by this push: new 2f89fbc Represent fingerprint internally as byte array 2f89fbc is described below commit 2f89fbc2ed3e25d2b4be76edc600cca37de91864 Author: Arlo Breault <arlolra(a)gmail.com> AuthorDate: Thu Mar 17 10:46:37 2022 -0400 Represent fingerprint internally as byte array --- broker/broker.go | 2 +- broker/ipc.go | 12 +++++++++--- common/messages/client.go | 4 ++++ common/messages/messages_test.go | 6 ++++++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/broker/broker.go b/broker/broker.go index 6e85fbd..10129d7 100644 --- a/broker/broker.go +++ b/broker/broker.go @@ -143,7 +143,7 @@ func (ctx *BrokerContext) AddSnowflake(id string, proxyType string, natType stri type ClientOffer struct { natType string sdp []byte - fingerprint string + fingerprint [20]byte } func main() { diff --git a/broker/ipc.go b/broker/ipc.go index 2ef4ccd..e11a33c 100644 --- a/broker/ipc.go +++ b/broker/ipc.go @@ -2,6 +2,7 @@ package main import ( "container/heap" + "encoding/hex" "fmt" "log" "net" @@ -130,11 +131,16 @@ func (i *IPC) ClientOffers(arg messages.Arg, response *[]byte) error { } offer := &ClientOffer{ - natType: req.NAT, - sdp: []byte(req.Offer), - fingerprint: req.Fingerprint, + natType: req.NAT, + sdp: []byte(req.Offer), } + fingerprint, err := hex.DecodeString(req.Fingerprint) + if err != nil { + return sendClientResponse(&messages.ClientPollResponse{Error: err.Error()}, response) + } + copy(offer.fingerprint[:], fingerprint) + // Only hand out known restricted snowflakes to unrestricted clients var snowflakeHeap *SnowflakeHeap if offer.natType == NATUnrestricted { diff --git a/common/messages/client.go b/common/messages/client.go index 4d435ab..96f8ed8 100644 --- a/common/messages/client.go +++ b/common/messages/client.go @@ -5,6 +5,7 @@ package messages import ( "bytes" + "encoding/hex" "encoding/json" "fmt" @@ -105,6 +106,9 @@ func DecodeClientPollRequest(data []byte) (*ClientPollRequest, error) { if message.Fingerprint == "" { message.Fingerprint = defaultBridgeFingerprint } + if hex.DecodedLen(len(message.Fingerprint)) != 20 { + return nil, fmt.Errorf("cannot decode fingerprint") + } switch message.NAT { case "": diff --git a/common/messages/messages_test.go b/common/messages/messages_test.go index 5365aa8..dd1f4fb 100644 --- a/common/messages/messages_test.go +++ b/common/messages/messages_test.go @@ -344,6 +344,12 @@ func TestEncodeClientPollRequests(t *testing.T) { defaultBridgeFingerprint, nil, }, + { + "unknown", + "fake", + "123123", + fmt.Errorf(""), + }, } { req1 := &ClientPollRequest{ NAT: test.natType, -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0