- tor-commits - lists.torproject.org

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated (93c9881b2a05 -> 0a0945855cb7)
by gitolite role 10 Oct '22

10 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. from 93c9881b2a05 fixup! Base Browser's .mozconfigs. new 6fc29f91fbe8 fixup! TB3: Tor Browser's official .mozconfigs. new d294beea175d Revert "Bug 28044: Integrate Tor Launcher into tor-browser" new ec870ce68851 Bug 40933: Add tor-launcher functionality new 1a64d858c5ab fixup! Bug 40933: Add tor-launcher functionality new 07710cca4425 fixup! Bug 40562: Added Tor-related preferences to 000-tor-browser.js new 2df6696ded66 fixup! Bug 40597: Implement TorSettings module new c3726ddc7c05 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser new eeb101368c6e fixup! Bug 4234: Use the Firefox Update Process for Tor Browser. new 91abcc7a6a7f fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new 0a0945855cb7 fixup! Bug 10760: Integrate TorButton to TorBrowser core The 10 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/app/profile/000-tor-browser.js | 69 ++ browser/components/sessionstore/SessionStore.jsm | 5 - .../torpreferences/content/connectionPane.js | 11 +- .../torpreferences/content/torLogDialog.jsm | 6 +- browser/config/mozconfigs/tor-browser-android | 3 - browser/extensions/moz.build | 3 - browser/installer/Makefile.in | 4 - browser/installer/package-manifest.in | 6 +- browser/modules/BridgeDB.jsm | 2 +- browser/modules/Moat.jsm | 4 +- browser/modules/TorConnect.jsm | 73 +- browser/modules/TorProcessService.jsm | 12 - browser/modules/TorProtocolService.jsm | 510 -------------- browser/modules/TorSettings.jsm | 25 +- browser/modules/moz.build | 2 - moz.configure | 18 - mozconfig-linux-x86_64-dev | 1 - toolkit/components/moz.build | 1 + .../processsingleton/MainProcessSingleton.jsm | 4 - .../tor-launcher/TorBootstrapRequest.jsm | 131 ++++ .../components/tor-launcher/TorLauncherUtil.jsm | 600 +++++++++++++++++ .../components/tor-launcher/TorMonitorService.jsm | 449 ++++++++++++ toolkit/components/tor-launcher/TorParsers.jsm | 275 ++++++++ toolkit/components/tor-launcher/TorProcess.jsm | 552 +++++++++++++++ .../components/tor-launcher/TorProtocolService.jsm | 749 +++++++++++++++++++++ .../components/tor-launcher/TorStartupService.jsm | 90 +++ toolkit/components/tor-launcher/components.conf | 10 + toolkit/components/tor-launcher/moz.build | 17 + .../components/tor-launcher/tor-launcher.manifest | 1 + toolkit/mozapps/update/UpdateService.jsm | 8 +- toolkit/torproject/torbutton | 2 +- 31 files changed, 3003 insertions(+), 640 deletions(-) delete mode 100644 browser/modules/TorProcessService.jsm delete mode 100644 browser/modules/TorProtocolService.jsm create mode 100644 toolkit/components/tor-launcher/TorBootstrapRequest.jsm create mode 100644 toolkit/components/tor-launcher/TorLauncherUtil.jsm create mode 100644 toolkit/components/tor-launcher/TorMonitorService.jsm create mode 100644 toolkit/components/tor-launcher/TorParsers.jsm create mode 100644 toolkit/components/tor-launcher/TorProcess.jsm create mode 100644 toolkit/components/tor-launcher/TorProtocolService.jsm create mode 100644 toolkit/components/tor-launcher/TorStartupService.jsm create mode 100644 toolkit/components/tor-launcher/components.conf create mode 100644 toolkit/components/tor-launcher/moz.build create mode 100644 toolkit/components/tor-launcher/tor-launcher.manifest -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 10

[torbutton] branch main updated (829fab42 -> d96a8864)
by gitolite role 10 Oct '22

10 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository torbutton. from 829fab42 Translation updates new 12c59736 Bug 40730: Do not register localizations in 102 new d96a8864 Bug 40933: Moved tor-launcher to tor-browser.git The 2 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: chrome/content/torbutton.js | 26 ++++++-------- components/startup-observer.js | 78 ++++++++++++++++++++++++------------------ modules/tor-control-port.js | 12 +++---- 3 files changed, 61 insertions(+), 55 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 2

[pluggable-transports/snowflake] branch main updated: format using go-1.19
by gitolite role 10 Oct '22

10 Oct '22

This is an automated email from the git hooks/post-receive script. shelikhoo 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 5ef5142 format using go-1.19 5ef5142 is described below commit 5ef5142bb02b8d274f88b8457d2ef4272f11a181 Author: trinity-1686a <trinity(a)deuxfleurs.fr> AuthorDate: Sun Oct 9 16:36:22 2022 +0200 format using go-1.19 --- client/lib/snowflake.go | 1 - common/amp/doc.go | 9 ++++++--- common/encapsulation/encapsulation.go | 22 ++++++++++++++-------- common/messages/client.go | 2 +- common/messages/proxy.go | 2 +- common/safelog/log.go | 2 +- common/safelog/log_test.go | 4 ++-- common/websocketconn/websocketconn_test.go | 6 ++++-- proxy/lib/snowflake.go | 4 ++-- server/lib/snowflake.go | 3 --- server/server.go | 6 +++--- 11 files changed, 34 insertions(+), 27 deletions(-) diff --git a/client/lib/snowflake.go b/client/lib/snowflake.go index 7231d86..c587e6d 100644 --- a/client/lib/snowflake.go +++ b/client/lib/snowflake.go @@ -22,7 +22,6 @@ The Dial function connects to a Snowflake server: // handle error } defer conn.Close() - */ package snowflake_client diff --git a/common/amp/doc.go b/common/amp/doc.go index 1387114..82e641b 100644 --- a/common/amp/doc.go +++ b/common/amp/doc.go @@ -2,7 +2,7 @@ Package amp provides functions for working with the AMP (Accelerated Mobile Pages) subset of HTML, and conveying binary data through an AMP cache. -AMP cache +# AMP cache The CacheURL function takes a plain URL and converts it to be accessed through a given AMP cache. @@ -11,7 +11,9 @@ The EncodePath and DecodePath functions provide a way to encode data into the suffix of a URL path. AMP caches do not support HTTP POST, but encoding data into a URL path with GET is an alternative means of sending data to the server. The format of an encoded path is: + 0<0 or more bytes, including slash>/<base64 of data> + That is: * "0", a format version number, which controls the interpretation of the rest of the path. Only the first byte matters as a version indicator (not the whole @@ -25,12 +27,13 @@ include slash). For example, an encoding of the string "This is path-encoded data." is the following. The "lgWHcwhXFjUm" following the format version number is random padding that will be ignored on decoding. + 0lgWHcwhXFjUm/VGhpcyBpcyBwYXRoLWVuY29kZWQgZGF0YS4 It is the caller's responsibility to add or remove any directory path prefix before calling EncodePath or DecodePath. -AMP armor +# AMP armor AMP armor is a data encoding scheme that that satisfies the requirements of the AMP (Accelerated Mobile Pages) subset of HTML, and survives modification by an @@ -63,7 +66,7 @@ limit the amount of text a decoder may have to buffer while parsing the HTML. Each pre element may contain at most 64 KB of text. pre elements may not be nested. -Example +# Example The following is the result of encoding the string "This was encoded with AMP armor.": diff --git a/common/encapsulation/encapsulation.go b/common/encapsulation/encapsulation.go index bfe9b5b..aee6a56 100644 --- a/common/encapsulation/encapsulation.go +++ b/common/encapsulation/encapsulation.go @@ -6,23 +6,29 @@ // represents data or padding (1=data, 0=padding). Another bit ("c" for // "continuation") is the indicates whether there are more bytes in the length // prefix. The remaining 6 bits ("x") encode part of the length value. -// dcxxxxxx +// +// dcxxxxxx +// // If the continuation bit is set, then the next byte is also part of the length // prefix. It lacks the "d" bit, has its own "c" bit, and 7 value-carrying bits // ("y"). -// cyyyyyyy +// +// cyyyyyyy +// // The length is decoded by concatenating value-carrying bits, from left to // right, of all value-carrying bits, up to and including the first byte whose // "c" bit is 0. Although in principle this encoding would allow for length // prefixes of any size, length prefixes are arbitrarily limited to 3 bytes and // any attempt to read or write a longer one is an error. These are therefore // the only valid formats: -// 00xxxxxx xxxxxx₂ bytes of padding -// 10xxxxxx xxxxxx₂ bytes of data -// 01xxxxxx 0yyyyyyy xxxxxxyyyyyyy₂ bytes of padding -// 11xxxxxx 0yyyyyyy xxxxxxyyyyyyy₂ bytes of data -// 01xxxxxx 1yyyyyyy 0zzzzzzz xxxxxxyyyyyyyzzzzzzz₂ bytes of padding -// 11xxxxxx 1yyyyyyy 0zzzzzzz xxxxxxyyyyyyyzzzzzzz₂ bytes of data +// +// 00xxxxxx xxxxxx₂ bytes of padding +// 10xxxxxx xxxxxx₂ bytes of data +// 01xxxxxx 0yyyyyyy xxxxxxyyyyyyy₂ bytes of padding +// 11xxxxxx 0yyyyyyy xxxxxxyyyyyyy₂ bytes of data +// 01xxxxxx 1yyyyyyy 0zzzzzzz xxxxxxyyyyyyyzzzzzzz₂ bytes of padding +// 11xxxxxx 1yyyyyyy 0zzzzzzz xxxxxxyyyyyyyzzzzzzz₂ bytes of data +// // The maximum encodable length is 11111111111111111111₂ = 0xfffff = 1048575. // There is no requirement to use a length prefix of minimum size; i.e. 00000100 // and 01000000 00000100 are both valid encodings of the value 4. diff --git a/common/messages/client.go b/common/messages/client.go index af63e08..4adc2a4 100644 --- a/common/messages/client.go +++ b/common/messages/client.go @@ -1,6 +1,6 @@ //Package for communication with the snowflake broker -//import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" +// import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" package messages import ( diff --git a/common/messages/proxy.go b/common/messages/proxy.go index b135c34..ef53e07 100644 --- a/common/messages/proxy.go +++ b/common/messages/proxy.go @@ -1,6 +1,6 @@ //Package for communication with the snowflake broker -//import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" +// import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/messages" package messages import ( diff --git a/common/safelog/log.go b/common/safelog/log.go index 6ca23ee..4c7c73b 100644 --- a/common/safelog/log.go +++ b/common/safelog/log.go @@ -1,6 +1,6 @@ //Package for a safer logging wrapper around the standard logging package -//import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" +// import "git.torproject.org/pluggable-transports/snowflake.git/v2/common/safelog" package safelog import ( diff --git a/common/safelog/log_test.go b/common/safelog/log_test.go index 16edbc9..94ca6e5 100644 --- a/common/safelog/log_test.go +++ b/common/safelog/log_test.go @@ -6,7 +6,7 @@ import ( "testing" ) -//Check to make sure that addresses split across calls to write are still scrubbed +// Check to make sure that addresses split across calls to write are still scrubbed func TestLogScrubberSplit(t *testing.T) { input := []byte("test\nhttp2: panic serving [2620:101:f000:780:9097:75b1:519f:dbb8]:58344: interface conversion: *http2.responseWriter is not http.Hijacker: missing method Hijack\n") @@ -49,7 +49,7 @@ func TestLogScrubberSplit(t *testing.T) { } -//Test the log scrubber on known problematic log messages +// Test the log scrubber on known problematic log messages func TestLogScrubberMessages(t *testing.T) { for _, test := range []struct { input, expected string diff --git a/common/websocketconn/websocketconn_test.go b/common/websocketconn/websocketconn_test.go index 92774d4..be00b1f 100644 --- a/common/websocketconn/websocketconn_test.go +++ b/common/websocketconn/websocketconn_test.go @@ -146,7 +146,8 @@ func TestWrite(t *testing.T) { // Test that multiple goroutines may call Read on a Conn simultaneously. Run // this with -// go test -race +// +// go test -race func TestConcurrentRead(t *testing.T) { s, c, err := connPair() if err != nil { @@ -189,7 +190,8 @@ func TestConcurrentRead(t *testing.T) { // Test that multiple goroutines may call Write on a Conn simultaneously. Run // this with -// go test -race +// +// go test -race func TestConcurrentWrite(t *testing.T) { s, c, err := connPair() if err != nil { diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go index f9bcddb..8269d61 100644 --- a/proxy/lib/snowflake.go +++ b/proxy/lib/snowflake.go @@ -70,8 +70,8 @@ const ( NATUnrestricted = "unrestricted" ) -//amount of time after sending an SDP answer before the proxy assumes the -//client is not going to connect +// amount of time after sending an SDP answer before the proxy assumes the +// client is not going to connect const dataChannelTimeout = 20 * time.Second const readLimit = 100000 //Maximum number of bytes to be read from an HTTP request diff --git a/server/lib/snowflake.go b/server/lib/snowflake.go index 44f287f..082e831 100644 --- a/server/lib/snowflake.go +++ b/server/lib/snowflake.go @@ -17,7 +17,6 @@ Transport as follows: transport := snowflake_server.NewSnowflakeServer(certManager.GetCertificate) - The Listen function starts a new listener, and Accept will return incoming Snowflake connections: ln, err := transport.Listen(addr) @@ -31,8 +30,6 @@ The Listen function starts a new listener, and Accept will return incoming Snowf } // handle conn } - - */ package snowflake_server diff --git a/server/server.go b/server/server.go index 4b53c86..ad08405 100644 --- a/server/server.go +++ b/server/server.go @@ -42,7 +42,7 @@ additional HTTP listener on port 80 to work with ACME. flag.PrintDefaults() } -//proxy copies data bidirectionally from one connection to another. +// proxy copies data bidirectionally from one connection to another. func proxy(local *net.TCPConn, conn net.Conn) { var wg sync.WaitGroup wg.Add(2) @@ -67,7 +67,7 @@ func proxy(local *net.TCPConn, conn net.Conn) { wg.Wait() } -//handleConn bidirectionally connects a client snowflake connection with an ORPort. +// handleConn bidirectionally connects a client snowflake connection with an ORPort. func handleConn(conn net.Conn) error { addr := conn.RemoteAddr().String() statsChannel <- addr != "" @@ -80,7 +80,7 @@ func handleConn(conn net.Conn) error { return nil } -//acceptLoop accepts incoming client snowflake connection and passes them to a handler function. +// acceptLoop accepts incoming client snowflake connection and passes them to a handler function. func acceptLoop(ln net.Listener) { for { conn, err := ln.Accept() -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40636: Remove https-everywhere from projects/browser/config
by gitolite role 10 Oct '22

10 Oct '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new b542c52 Bug 40636: Remove https-everywhere from projects/browser/config b542c52 is described below commit b542c5269e0ddb189a461aa06d75b3f692745b88 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Sun Oct 9 22:48:28 2022 +0200 Bug 40636: Remove https-everywhere from projects/browser/config In af97862c4b857415eade803c6a417474297fc54b we removed https-everywhere from Android builds, but forgot to remove it from projects/browser/config. --- projects/browser/config | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/browser/config b/projects/browser/config index 03cde94..10b7eb9 100644 --- a/projects/browser/config +++ b/projects/browser/config @@ -76,9 +76,6 @@ input_files: - project: firefox-langpacks name: firefox-langpacks enable: '[% ! c("var/testbuild") && ! c("var/android") %]' - - project: https-everywhere - name: https-everywhere - enable: '[% c("var/android") %]' - project: fonts name: fonts enable: '[% ! c("var/android") %]' -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: fixup! Base Browser's .mozconfigs.
by gitolite role 08 Oct '22

08 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push: new 93c9881b2a05 fixup! Base Browser's .mozconfigs. 93c9881b2a05 is described below commit 93c9881b2a05bb745a772c125e252456d404c7ad Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Sat Oct 8 17:55:29 2022 +0000 fixup! Base Browser's .mozconfigs. Bug 41343: Add -without-wam-sandboxed-libraries to mozconfig-linux-x86_64-dev for local builds --- mozconfig-linux-x86_64-dev | 1 + 1 file changed, 1 insertion(+) diff --git a/mozconfig-linux-x86_64-dev b/mozconfig-linux-x86_64-dev index ce66cd7cdc3e..06d16d40fcf1 100644 --- a/mozconfig-linux-x86_64-dev +++ b/mozconfig-linux-x86_64-dev @@ -12,3 +12,4 @@ ac_add_options --disable-install-strip ac_add_options --enable-tor-launcher ac_add_options --disable-tor-browser-update ac_add_options --with-tor-browser-version=dev-build +ac_add_options --without-wasm-sandboxed-libraries -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: squash! Firefox preference overrides.
by gitolite role 08 Oct '22

08 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push: new 58364b04825f squash! Firefox preference overrides. 58364b04825f is described below commit 58364b04825f023b11617590a404dfcc35e40d21 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Sat Oct 8 01:58:37 2022 +0000 squash! Firefox preference overrides. Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector --- browser/app/profile/001-base-profile.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/app/profile/001-base-profile.js b/browser/app/profile/001-base-profile.js index 374bc3d1550e..f4524718aa3f 100644 --- a/browser/app/profile/001-base-profile.js +++ b/browser/app/profile/001-base-profile.js @@ -226,6 +226,8 @@ pref("dom.textMetrics.emHeight.enabled", false); pref("dom.textMetrics.fontBoundingBox.enabled", false); pref("pdfjs.enableScripting", false); pref("javascript.options.large_arraybuffers", false); +// Bug 40057: Ensure system colors are not used for CSS4 colors +pref("browser.display.use_system_colors", false); // Third party stuff pref("privacy.firstparty.isolate", true); // Always enforce first party isolation -- 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.5.4-build2 created (now c1e0678)
by gitolite role 08 Oct '22

08 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to annotated tag tbb-11.5.4-build2 in repository builders/tor-browser-build. at c1e0678 (tag) tagging f63875fdf8e0e924f5ab19eafc8f689cfd85002c (commit) replaces tbb-11.5.4-build1 by Pier Angelo Vendrame on Sat Oct 8 17:19:46 2022 +0000 - Log ----------------------------------------------------------------- Tagging build2 for 11.5.4 -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQQCHOE9KLO2f598e8HwdW0XkBKIkQUCY0GxMgAKCRDwdW0XkBKI kaT4AP9M3yjttOxkjf0Ovn2lVG0NxtFtyL17luYC07ZJHXf97QD/dk+3ok/DB63I 7SqB95BNXN2V0GdNPwQ90/zXKyywjAU= =XhmP -----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 maint-11.5 updated (25c2068 -> f63875f)
by gitolite role 08 Oct '22

08 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a change to branch maint-11.5 in repository builders/tor-browser-build. from 25c2068 fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e new 903e43e Update rbm for rbm#40043 new 2479296 Bug 40608: Updated TBA toolchains for 11.5.4 new f63875f fixup! Bug 40608: Prepare stable release 11.5.4 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: projects/android-components/build | 7 + projects/android-components/config | 8 +- .../gradle-dependencies-list.txt | 492 ++++----- projects/application-services/bug40485.patch | 23 +- projects/application-services/build | 2 +- projects/application-services/config | 14 +- projects/cbindgen/build | 2 +- projects/cbindgen/config | 19 +- projects/clang/build | 21 +- projects/fenix/config | 8 +- projects/fenix/gradle-dependencies-list.txt | 1071 ++++++++++---------- projects/geckoview/build | 4 +- projects/geckoview/config | 6 +- projects/geckoview/gradle-dependencies-list.txt | 20 +- projects/geckoview/list_toolchain_updates_checks | 23 +- projects/llvm-project/config | 4 +- projects/rust/config | 4 +- projects/sqlcipher/config | 4 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 + rbm | 2 +- rbm.conf | 6 +- 21 files changed, 929 insertions(+), 817 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor-browser] branch tor-browser-102.3.0esr-12.0-2 updated: Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.3.0esr-12.0-2 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.3.0esr-12.0-2 by this push: new 5b3b50e96dd6 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds 5b3b50e96dd6 is described below commit 5b3b50e96dd65bcd3b062a83f300a4a634437651 Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Fri Sep 30 15:04:37 2022 +0100 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. --- build/moz.configure/init.configure | 10 ++++++++++ intl/l10n/Localization.h | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index a85df3393c16..e64852eb3ac0 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -1094,6 +1094,16 @@ set_define("MOZ_UPDATE_CHANNEL", update_channel) add_old_configure_assignment("MOZ_UPDATE_CHANNEL", update_channel) +# Add a TOR_BROWSER_NIGHTLY_BUILD flag to use when MOZ_UPDATE_CHANNEL cannot be +# used. For example, for the C++ preprocessor. See tor-browser#41340 +@depends("--enable-update-channel") +def tor_browser_nightly_build(channel): + if channel and channel[0] in ["default", "nightly"]: + return True + +set_define("TOR_BROWSER_NIGHTLY_BUILD", tor_browser_nightly_build) + + option( env="MOZBUILD_STATE_PATH", nargs=1, diff --git a/intl/l10n/Localization.h b/intl/l10n/Localization.h index 54c78f68dbe7..ebe285be4772 100644 --- a/intl/l10n/Localization.h +++ b/intl/l10n/Localization.h @@ -51,7 +51,8 @@ namespace intl { return true; } -#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION) || defined(DEBUG) + // See tor-browser#41285 +#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION) || defined(DEBUG) || defined(TOR_BROWSER_NIGHTLY_BUILD) dom::Document* doc = nullptr; if (aGlobal) { nsPIDOMWindowInner* innerWindow = aGlobal->AsInnerWindow(); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch maint-11.5 updated: fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e
by gitolite role 07 Oct '22

07 Oct '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch maint-11.5 in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/maint-11.5 by this push: new 25c2068 fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e 25c2068 is described below commit 25c2068f0ddd0595cf649a3830b60a670a5b9e72 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Fri Oct 7 19:13:12 2022 +0000 fixup! Bug 40629: Bump snowflake version to 9ce1de4eee4e Moved use_container declaration out of /var and into / for new refaction-utls project --- projects/refraction-utls/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/refraction-utls/config b/projects/refraction-utls/config index e6974b4..c354437 100644 --- a/projects/refraction-utls/config +++ b/projects/refraction-utls/config @@ -3,12 +3,12 @@ version: '[% c("abbrev") %]' git_url: https://github.com/refraction-networking/utls git_hash: 0b2885c8c0d4467cfe98136748a9d011d0b8fff0 #v1.0.0 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +container: + use_container: 1 build: '[% c("projects/go/var/build_go_lib") %]' var: - container: - use_container: 1 go_lib: github.com/refraction-networking/utls go_lib_deps: - goxcrypto -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0