February 2023 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][main] Bug 40757: Use single .nsi template for all browsers
by boklm (＠boklm) 10 Feb '23

10 Feb '23

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 3299ed3d by Nicolas Vigier at 2023-02-10T09:44:21+01:00 Bug 40757: Use single .nsi template for all browsers - - - - - 4 changed files: - projects/browser/build - projects/browser/windows-installer/basebrowser.nsi → projects/browser/windows-installer.nsi - − projects/browser/windows-installer/privacybrowser.nsi - − projects/browser/windows-installer/torbrowser.nsi Changes: ===================================== projects/browser/build ===================================== @@ -285,6 +285,9 @@ done export PATH="/var/tmp/dist/nsis/bin:$PATH" mv $rootdir/windows-installer $distdir/windows-installer + cat > $distdir/windows-installer/browser.nsi << 'BROWSER_NSI' +[% INCLUDE 'windows-installer.nsi' %] +BROWSER_NSI mv ${TB_STAGE_DIR} $distdir/windows-installer/"[% c('var/Project_Name') %]" mv $distdir/windows-installer ${TB_STAGE_DIR} [% END %] @@ -354,7 +357,7 @@ cd $distdir [% ELSIF c("var/windows") %] find "$PKG_DIR" -exec [% c("touch") %] {} \; pushd "$PKG_DIR" - makensis [% c("var/projectname") %].nsi + makensis browser.nsi # Working around NSIS braindamage mv [% c("var/projectname") %]-install.exe browser-install-tmp.exe python3 $rootdir/pe_checksum_fix.py ===================================== projects/browser/windows-installer/basebrowser.nsi → projects/browser/windows-installer.nsi ===================================== @@ -1,4 +1,4 @@ -;NSIS Installer for Base Browser Bundle +;NSIS Installer for Tor/Base/Privacy Browser ;Written by Moritz Bartl ;released under Public Domain @@ -12,14 +12,14 @@ ;-------------------------------- ;General - ; location of Base Browser bundle to put into installer - !define TBBSOURCE ".\Base Browser\" + ; location of Tor/Base/Privacy Browser to put into installer + !define PROGRAM_SOURCE ".\[% c('var/Project_Name') %]\" - Name "Base Browser" - OutFile "basebrowser-install.exe" + Name "[% c('var/Project_Name') %]" + OutFile "[% c('var/projectname') %]-install.exe" ;Default installation folder - InstallDir "$DESKTOP\Base Browser" + InstallDir "$DESKTOP\[% c('var/Project_Name') %]" ;Best (but slowest) compression SetCompressor /SOLID lzma @@ -31,14 +31,14 @@ ;-------------------------------- ;Interface Configuration - !define MUI_ICON "basebrowser.ico" + !define MUI_ICON "[% c('var/projectname') %].ico" !define MUI_ABORTWARNING ;-------------------------------- ;Modern UI settings !define MUI_FINISHPAGE_NOREBOOTSUPPORT ; we don't require a reboot !define MUI_FINISHPAGE_RUN - !define MUI_FINISHPAGE_RUN_FUNCTION "StartBaseBrowser" + !define MUI_FINISHPAGE_RUN_FUNCTION "StartBrowser" !define MUI_FINISHPAGE_SHOWREADME ; misuse for option to create shortcut; less ugly than MUI_PAGE_COMPONENTS !define MUI_FINISHPAGE_SHOWREADME_TEXT "&Add Start Menu && Desktop shortcuts" !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "CreateShortCuts" @@ -113,7 +113,7 @@ ;-------------------------------- ;Multi Language support: Read strings from separate file -; !include torbrowser-langstrings.nsi +; !include [% c('var/projectname') %]-langstrings.nsi ;-------------------------------- ;Reserve Files @@ -127,19 +127,19 @@ ;-------------------------------- ;Installer Sections -Section "Base Browser Bundle" SecTBB +Section "[% c('var/Project_Name') %]" SecBrowser SetOutPath "$INSTDIR" - File /r "${TBBSOURCE}\*.*" + File /r "${PROGRAM_SOURCE}\*.*" SetOutPath "$INSTDIR\Browser" - CreateShortCut "$INSTDIR\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" + CreateShortCut "$INSTDIR\Start [% c('var/Project_Name') %].lnk" "$INSTDIR\Browser\[% c('var/exe_name') %].exe" SectionEnd Function CreateShortcuts - CreateShortCut "$SMPROGRAMS\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" - CreateShortCut "$DESKTOP\Start Base Browser.lnk" "$INSTDIR\Browser\firefox.exe" + CreateShortCut "$SMPROGRAMS\Start [% c('var/Project_Name') %].lnk" "$INSTDIR\Browser\[% c('var/exe_name') %].exe" + CreateShortCut "$DESKTOP\Start [% c('var/Project_Name') %].lnk" "$INSTDIR\Browser\[% c('var/exe_name') %].exe" FunctionEnd ;-------------------------------- @@ -148,7 +148,7 @@ FunctionEnd Function .onInit ${IfNot} ${AtLeastWin7} - MessageBox MB_USERICON|MB_OK "Base Browser requires at least Windows 7" + MessageBox MB_USERICON|MB_OK "[% c('var/Project_Name') %] requires at least Windows 7" SetErrorLevel 1 Quit ${EndIf} @@ -159,7 +159,7 @@ Function .onInit System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" ${If} "$R7" == "0" - MessageBox MB_OK|MB_ICONSTOP "Sorry, Base Browser can't be installed. This version of Base Browser requires a processor with SSE2 support." + MessageBox MB_OK|MB_ICONSTOP "Sorry, [% c('var/Project_Name') %] can't be installed. This version of [% c('var/Project_Name') %] requires a processor with SSE2 support." Abort ${EndIf} @@ -172,14 +172,14 @@ FunctionEnd Function CheckIfTargetDirectoryExists ${If} ${FileExists} "$INSTDIR\*.*" - MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade the Base Browser Bundle, but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort + MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade the [% c('var/Project_Name') %], but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort Abort NoAbort: ${EndIf} FunctionEnd -Function StartBaseBrowser -ExecShell "open" "$INSTDIR/Start Base Browser.lnk" +Function StartBrowser +ExecShell "open" "$INSTDIR/Start [% c('var/Project_Name') %].lnk" FunctionEnd ===================================== projects/browser/windows-installer/privacybrowser.nsi deleted ===================================== @@ -1,180 +0,0 @@ -;NSIS Installer for Privacy Browser -;Written by Moritz Bartl -;released under Public Domain - -;-------------------------------- -;Modern UI - - !include "MUI2.nsh" - !include "LogicLib.nsh" - !include "WinVer.nsh" - -;-------------------------------- -;General - - ; location of Privacy Browser bundle to put into installer - !define TBBSOURCE ".\Privacy Browser\" - - Name "Privacy Browser" - OutFile "privacybrowser-install.exe" - - ;Default installation folder - InstallDir "$DESKTOP\Privacy Browser" - - ;Best (but slowest) compression - SetCompressor /SOLID lzma - SetCompressorDictSize 32 - - ;Request application privileges for Windows Vista - RequestExecutionLevel user - -;-------------------------------- -;Interface Configuration - - !define MUI_ICON "privacybrowser.ico" - !define MUI_ABORTWARNING - -;-------------------------------- -;Modern UI settings - !define MUI_FINISHPAGE_NOREBOOTSUPPORT ; we don't require a reboot - !define MUI_FINISHPAGE_RUN - !define MUI_FINISHPAGE_RUN_FUNCTION "StartPrivacyBrowser" - !define MUI_FINISHPAGE_SHOWREADME ; misuse for option to create shortcut; less ugly than MUI_PAGE_COMPONENTS - !define MUI_FINISHPAGE_SHOWREADME_TEXT "&Add Start Menu && Desktop shortcuts" - !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "CreateShortCuts" -;-------------------------------- -;Pages - - !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckIfTargetDirectoryExists - !insertmacro MUI_PAGE_DIRECTORY - !insertmacro MUI_PAGE_INSTFILES - !insertmacro MUI_PAGE_FINISH - -;-------------------------------- -;Languages - - !insertmacro MUI_LANGUAGE "English" ;first language is the default language - !insertmacro MUI_LANGUAGE "French" - !insertmacro MUI_LANGUAGE "German" - !insertmacro MUI_LANGUAGE "Spanish" - !insertmacro MUI_LANGUAGE "SpanishInternational" - !insertmacro MUI_LANGUAGE "SimpChinese" - !insertmacro MUI_LANGUAGE "TradChinese" - !insertmacro MUI_LANGUAGE "Japanese" - !insertmacro MUI_LANGUAGE "Korean" - !insertmacro MUI_LANGUAGE "Italian" - !insertmacro MUI_LANGUAGE "Dutch" - !insertmacro MUI_LANGUAGE "Danish" - !insertmacro MUI_LANGUAGE "Swedish" - !insertmacro MUI_LANGUAGE "Norwegian" - !insertmacro MUI_LANGUAGE "NorwegianNynorsk" - !insertmacro MUI_LANGUAGE "Finnish" - !insertmacro MUI_LANGUAGE "Greek" - !insertmacro MUI_LANGUAGE "Russian" - !insertmacro MUI_LANGUAGE "Portuguese" - !insertmacro MUI_LANGUAGE "PortugueseBR" - !insertmacro MUI_LANGUAGE "Polish" - !insertmacro MUI_LANGUAGE "Ukrainian" - !insertmacro MUI_LANGUAGE "Czech" - !insertmacro MUI_LANGUAGE "Slovak" - !insertmacro MUI_LANGUAGE "Croatian" - !insertmacro MUI_LANGUAGE "Bulgarian" - !insertmacro MUI_LANGUAGE "Hungarian" - !insertmacro MUI_LANGUAGE "Thai" - !insertmacro MUI_LANGUAGE "Romanian" - !insertmacro MUI_LANGUAGE "Latvian" - !insertmacro MUI_LANGUAGE "Macedonian" - !insertmacro MUI_LANGUAGE "Estonian" - !insertmacro MUI_LANGUAGE "Turkish" - !insertmacro MUI_LANGUAGE "Lithuanian" - !insertmacro MUI_LANGUAGE "Slovenian" - !insertmacro MUI_LANGUAGE "Serbian" - !insertmacro MUI_LANGUAGE "SerbianLatin" - !insertmacro MUI_LANGUAGE "Arabic" - !insertmacro MUI_LANGUAGE "Farsi" - !insertmacro MUI_LANGUAGE "Hebrew" - !insertmacro MUI_LANGUAGE "Indonesian" - !insertmacro MUI_LANGUAGE "Mongolian" - !insertmacro MUI_LANGUAGE "Luxembourgish" - !insertmacro MUI_LANGUAGE "Albanian" - !insertmacro MUI_LANGUAGE "Breton" - !insertmacro MUI_LANGUAGE "Belarusian" - !insertmacro MUI_LANGUAGE "Icelandic" - !insertmacro MUI_LANGUAGE "Malay" - !insertmacro MUI_LANGUAGE "Bosnian" - !insertmacro MUI_LANGUAGE "Kurdish" - !insertmacro MUI_LANGUAGE "Irish" - !insertmacro MUI_LANGUAGE "Uzbek" - !insertmacro MUI_LANGUAGE "Galician" - !insertmacro MUI_LANGUAGE "Afrikaans" - !insertmacro MUI_LANGUAGE "Catalan" - !insertmacro MUI_LANGUAGE "Esperanto" - -;-------------------------------- -;Reserve Files - - ;If you are using solid compression, files that are required before - ;the actual installation should be stored first in the data block, - ;because this will make your installer start faster. - - !insertmacro MUI_RESERVEFILE_LANGDLL - -;-------------------------------- -;Installer Sections - -Section "Privacy Browser" SecPB - - SetOutPath "$INSTDIR" - File /r "${TBBSOURCE}\*.*" - SetOutPath "$INSTDIR\Browser" - CreateShortCut "$INSTDIR\Start Privacy Browser.lnk" "$INSTDIR\Browser\privacybrowser.exe" - -SectionEnd - -Function CreateShortcuts - - CreateShortCut "$SMPROGRAMS\Start Privacy Browser.lnk" "$INSTDIR\Browser\privacybrowser.exe" - CreateShortCut "$DESKTOP\Start Privacy Browser.lnk" "$INSTDIR\Browser\privacybrowser.exe" - -FunctionEnd -;-------------------------------- -;Installer Functions - -Function .onInit - - ${IfNot} ${AtLeastWin7} - MessageBox MB_USERICON|MB_OK "Privacy Browser requires at least Windows 7" - SetErrorLevel 1 - Quit - ${EndIf} - - ; Don't install on systems that don't support SSE2. The parameter value of - ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the - ; SSE2 instruction set is available. - System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" - - ${If} "$R7" == "0" - MessageBox MB_OK|MB_ICONSTOP "Sorry, Privacy Browser can't be installed. This version of Privacy Browser requires a processor with SSE2 support." - Abort - ${EndIf} - - !insertmacro MUI_LANGDLL_DISPLAY - -FunctionEnd - -;-------------------------------- -;Helper Functions - -Function CheckIfTargetDirectoryExists -${If} ${FileExists} "$INSTDIR\*.*" - MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade Privacy Browser, but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort - Abort - NoAbort: -${EndIf} -FunctionEnd - - -Function StartPrivacyBrowser -ExecShell "open" "$INSTDIR/Start Privacy Browser.lnk" -FunctionEnd - ===================================== projects/browser/windows-installer/torbrowser.nsi deleted ===================================== @@ -1,185 +0,0 @@ -;NSIS Installer for Tor Browser Bundle -;Written by Moritz Bartl -;released under Public Domain - -;-------------------------------- -;Modern UI - - !include "MUI2.nsh" - !include "LogicLib.nsh" - !include "WinVer.nsh" - -;-------------------------------- -;General - - ; location of Tor Browser bundle to put into installer - !define TBBSOURCE ".\Tor Browser\" - - Name "Tor Browser" - OutFile "torbrowser-install.exe" - - ;Default installation folder - InstallDir "$DESKTOP\Tor Browser" - - ;Best (but slowest) compression - SetCompressor /SOLID lzma - SetCompressorDictSize 32 - - ;Request application privileges for Windows Vista - RequestExecutionLevel user - -;-------------------------------- -;Interface Configuration - - !define MUI_ICON "torbrowser.ico" - !define MUI_ABORTWARNING - -;-------------------------------- -;Modern UI settings - !define MUI_FINISHPAGE_NOREBOOTSUPPORT ; we don't require a reboot - !define MUI_FINISHPAGE_RUN - !define MUI_FINISHPAGE_RUN_FUNCTION "StartTorBrowser" - !define MUI_FINISHPAGE_SHOWREADME ; misuse for option to create shortcut; less ugly than MUI_PAGE_COMPONENTS - !define MUI_FINISHPAGE_SHOWREADME_TEXT "&Add Start Menu && Desktop shortcuts" - !define MUI_FINISHPAGE_SHOWREADME_FUNCTION "CreateShortCuts" -;-------------------------------- -;Pages - - !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckIfTargetDirectoryExists - !insertmacro MUI_PAGE_DIRECTORY - !insertmacro MUI_PAGE_INSTFILES - !insertmacro MUI_PAGE_FINISH - -;-------------------------------- -;Languages - - !insertmacro MUI_LANGUAGE "English" ;first language is the default language - !insertmacro MUI_LANGUAGE "French" - !insertmacro MUI_LANGUAGE "German" - !insertmacro MUI_LANGUAGE "Spanish" - !insertmacro MUI_LANGUAGE "SpanishInternational" - !insertmacro MUI_LANGUAGE "SimpChinese" - !insertmacro MUI_LANGUAGE "TradChinese" - !insertmacro MUI_LANGUAGE "Japanese" - !insertmacro MUI_LANGUAGE "Korean" - !insertmacro MUI_LANGUAGE "Italian" - !insertmacro MUI_LANGUAGE "Dutch" - !insertmacro MUI_LANGUAGE "Danish" - !insertmacro MUI_LANGUAGE "Swedish" - !insertmacro MUI_LANGUAGE "Norwegian" - !insertmacro MUI_LANGUAGE "NorwegianNynorsk" - !insertmacro MUI_LANGUAGE "Finnish" - !insertmacro MUI_LANGUAGE "Greek" - !insertmacro MUI_LANGUAGE "Russian" - !insertmacro MUI_LANGUAGE "Portuguese" - !insertmacro MUI_LANGUAGE "PortugueseBR" - !insertmacro MUI_LANGUAGE "Polish" - !insertmacro MUI_LANGUAGE "Ukrainian" - !insertmacro MUI_LANGUAGE "Czech" - !insertmacro MUI_LANGUAGE "Slovak" - !insertmacro MUI_LANGUAGE "Croatian" - !insertmacro MUI_LANGUAGE "Bulgarian" - !insertmacro MUI_LANGUAGE "Hungarian" - !insertmacro MUI_LANGUAGE "Thai" - !insertmacro MUI_LANGUAGE "Romanian" - !insertmacro MUI_LANGUAGE "Latvian" - !insertmacro MUI_LANGUAGE "Macedonian" - !insertmacro MUI_LANGUAGE "Estonian" - !insertmacro MUI_LANGUAGE "Turkish" - !insertmacro MUI_LANGUAGE "Lithuanian" - !insertmacro MUI_LANGUAGE "Slovenian" - !insertmacro MUI_LANGUAGE "Serbian" - !insertmacro MUI_LANGUAGE "SerbianLatin" - !insertmacro MUI_LANGUAGE "Arabic" - !insertmacro MUI_LANGUAGE "Farsi" - !insertmacro MUI_LANGUAGE "Hebrew" - !insertmacro MUI_LANGUAGE "Indonesian" - !insertmacro MUI_LANGUAGE "Mongolian" - !insertmacro MUI_LANGUAGE "Luxembourgish" - !insertmacro MUI_LANGUAGE "Albanian" - !insertmacro MUI_LANGUAGE "Breton" - !insertmacro MUI_LANGUAGE "Belarusian" - !insertmacro MUI_LANGUAGE "Icelandic" - !insertmacro MUI_LANGUAGE "Malay" - !insertmacro MUI_LANGUAGE "Bosnian" - !insertmacro MUI_LANGUAGE "Kurdish" - !insertmacro MUI_LANGUAGE "Irish" - !insertmacro MUI_LANGUAGE "Uzbek" - !insertmacro MUI_LANGUAGE "Galician" - !insertmacro MUI_LANGUAGE "Afrikaans" - !insertmacro MUI_LANGUAGE "Catalan" - !insertmacro MUI_LANGUAGE "Esperanto" - -;-------------------------------- -;Multi Language support: Read strings from separate file - -; !include torbrowser-langstrings.nsi - -;-------------------------------- -;Reserve Files - - ;If you are using solid compression, files that are required before - ;the actual installation should be stored first in the data block, - ;because this will make your installer start faster. - - !insertmacro MUI_RESERVEFILE_LANGDLL - -;-------------------------------- -;Installer Sections - -Section "Tor Browser Bundle" SecTBB - - SetOutPath "$INSTDIR" - File /r "${TBBSOURCE}\*.*" - SetOutPath "$INSTDIR\Browser" - CreateShortCut "$INSTDIR\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" - -SectionEnd - -Function CreateShortcuts - - CreateShortCut "$SMPROGRAMS\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" - CreateShortCut "$DESKTOP\Start Tor Browser.lnk" "$INSTDIR\Browser\firefox.exe" - -FunctionEnd -;-------------------------------- -;Installer Functions - -Function .onInit - - ${IfNot} ${AtLeastWin7} - MessageBox MB_USERICON|MB_OK "Tor Browser requires at least Windows 7" - SetErrorLevel 1 - Quit - ${EndIf} - - ; Don't install on systems that don't support SSE2. The parameter value of - ; 10 is for PF_XMMI64_INSTRUCTIONS_AVAILABLE which will check whether the - ; SSE2 instruction set is available. - System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" - - ${If} "$R7" == "0" - MessageBox MB_OK|MB_ICONSTOP "Sorry, Tor Browser can't be installed. This version of Tor Browser requires a processor with SSE2 support." - Abort - ${EndIf} - - !insertmacro MUI_LANGDLL_DISPLAY - -FunctionEnd - -;-------------------------------- -;Helper Functions - -Function CheckIfTargetDirectoryExists -${If} ${FileExists} "$INSTDIR\*.*" - MessageBox MB_YESNO "The destination directory already exists. You can try to upgrade the Tor Browser Bundle, but if you run into any problems, use a new directory instead. Continue?" IDYES NoAbort - Abort - NoAbort: -${EndIf} -FunctionEnd - - -Function StartTorBrowser -ExecShell "open" "$INSTDIR/Start Tor Browser.lnk" -FunctionEnd - View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[pluggable-transports/snowflake] branch main updated: fix: up/down traffic stats being mixed up
by gitolite role 09 Feb '23

09 Feb '23

This is an automated email from the git hooks/post-receive script. itchyonion 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 5cc849e fix: up/down traffic stats being mixed up 5cc849e is described below commit 5cc849e186a7b5f5cac238e3497a64bd46ac0a29 Author: WofWca <wofwca(a)protonmail.com> AuthorDate: Thu Jan 12 08:54:59 2023 +0000 fix: up/down traffic stats being mixed up --- proxy/lib/pt_event_logger.go | 2 +- proxy/lib/util.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/lib/pt_event_logger.go b/proxy/lib/pt_event_logger.go index ce89545..745437b 100644 --- a/proxy/lib/pt_event_logger.go +++ b/proxy/lib/pt_event_logger.go @@ -41,7 +41,7 @@ func (p *logEventLogger) OnNewSnowflakeEvent(e event.SnowflakeEvent) { func (p *logEventLogger) logTick() error { inbound, inboundUnit := formatTraffic(p.inboundSum) outbound, outboundUnit := formatTraffic(p.outboundSum) - p.logger.Printf("In the last %v, there were %v connections. Traffic Relayed ↑ %v %v, ↓ %v %v.\n", + p.logger.Printf("In the last %v, there were %v connections. Traffic Relayed ↓ %v %v, ↑ %v %v.\n", p.logPeriod.String(), p.connectionCount, inbound, inboundUnit, outbound, outboundUnit) p.outboundSum = 0 p.inboundSum = 0 diff --git a/proxy/lib/util.go b/proxy/lib/util.go index 0bbe588..dd8681e 100644 --- a/proxy/lib/util.go +++ b/proxy/lib/util.go @@ -80,7 +80,7 @@ func (b *bytesSyncLogger) ThroughputSummary() string { outbound, outUnit := formatTraffic(outbound) t := time.Now() - return fmt.Sprintf("Traffic throughput (up|down): %d %s|%d %s -- (%d OnMessages, %d Sends, over %d seconds)", inbound, inUnit, outbound, outUnit, b.outEvents, b.inEvents, int(t.Sub(b.start).Seconds())) + return fmt.Sprintf("Traffic throughput (down|up): %d %s|%d %s -- (%d OnMessages, %d Sends, over %d seconds)", inbound, inUnit, outbound, outUnit, b.outEvents, b.inEvents, int(t.Sub(b.start).Seconds())) } func (b *bytesSyncLogger) GetStat() (in int64, out int64) { return b.inbound, b.outbound } -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[Git][tpo/applications/fenix] Pushed new tag tor-browser-102.2.1-12.0-2-build2
by Richard Pospesel (＠richard) 09 Feb '23

09 Feb '23

Richard Pospesel pushed new tag tor-browser-102.2.1-12.0-2-build2 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-102… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.8.0esr-12.0-1-build2
by Richard Pospesel (＠richard) 09 Feb '23

09 Feb '23

Richard Pospesel pushed new tag tor-browser-102.8.0esr-12.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Apply Snowflake Remove HelloVerify Countermeasure
by Richard Pospesel (＠richard) 09 Feb '23

09 Feb '23

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: f53e987f by Shelikhoo at 2023-02-09T16:37:25+00:00 Apply Snowflake Remove HelloVerify Countermeasure (cherry picked from commit 4f631cd2d70f9253a09783d1fb1d72335cac9dae) - - - - - 3 changed files: - projects/pion-dtls/config - projects/pion-webrtc/config - projects/snowflake/config Changes: ===================================== projects/pion-dtls/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://github.com/pion/dtls -git_hash: d2f797183a9f044ce976e6df6f362662ca722412 #v2.1.5 +git_url: https://github.com/xiaokangwang/dtls +git_hash: 16e5cc8ce01c0262e4d945b7fe90eba4d7d58ce5 #v2.1.5+patch filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 ===================================== projects/pion-webrtc/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' -git_url: https://github.com/pion/webrtc -git_hash: 7367daf2324b66290f0bdbaab1e51297de1f4989 #v3.1.41 +git_url: https://github.com/xiaokangwang/webrtc +git_hash: be9162e2b526205877a0069bdbf8c97655345403 #v3.1.41+patch filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: use_container: 1 ===================================== projects/snowflake/config ===================================== @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… -git_hash: 9ce1de4eee4e23c918c7c5e96666ff5c6ddc654e +git_hash: 7b77001eaa90e09d41172a2b170dabd3f1922b4a filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' container: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING
by Richard Pospesel (＠richard) 09 Feb '23

09 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 753674e7 by cypherpunks1 at 2023-02-09T16:16:49+00:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING (cherry picked from commit 47eb7d305746bd1a9e328b1fb7fef40d56769d5b) - - - - - 4 changed files: - browser/base/content/browser.js - browser/components/BrowserGlue.jsm - toolkit/components/telemetry/app/TelemetryEnvironment.jsm - toolkit/xre/nsAppRunner.cpp Changes: ===================================== browser/base/content/browser.js ===================================== @@ -6053,6 +6053,7 @@ var TabsProgressListener = { // Collect telemetry data about tab load times. if ( + AppConstants.MOZ_TELEMETRY_REPORTING && aWebProgress.isTopLevel && (!aRequest.originalURI || aRequest.originalURI.scheme != "about") ) { ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -1721,7 +1721,9 @@ BrowserGlue.prototype = { this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); - this._collectStartupConditionsTelemetry(); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + this._collectStartupConditionsTelemetry(); + } // Set the default favicon size for UI views that use the page-icon protocol. PlacesUtils.favicons.setDefaultIconURIPreferredSize( @@ -2920,13 +2922,21 @@ BrowserGlue.prototype = { } }, - () => BrowserUsageTelemetry.reportProfileCount(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportProfileCount(); + } + }, () => OsEnvironment.reportAllowedAppSources(), () => Services.search.runBackgroundChecks(), - () => BrowserUsageTelemetry.reportInstallationTelemetry(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportInstallationTelemetry(); + } + }, ]; for (let task of idleTasks) { ===================================== toolkit/components/telemetry/app/TelemetryEnvironment.jsm ===================================== @@ -973,7 +973,9 @@ function EnvironmentCache() { p.push(this._addonBuilder.init()); this._currentEnvironment.profile = {}; - p.push(this._updateProfile()); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + p.push(this._updateProfile()); + } if (AppConstants.MOZ_BUILD_APP == "browser") { p.push(this._loadAttributionAsync()); } ===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -2886,7 +2886,9 @@ static ReturnAbortOnError ProfileErrorDialog(nsIFile* aProfileDir, rv = xpcom.Initialize(); NS_ENSURE_SUCCESS(rv, rv); +#if defined(MOZ_TELEMETRY_REPORTING) if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir); +#endif rv = xpcom.SetWindowCreator(aNative); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/753674e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/753674e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.8.0esr-12.0-1] Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING
by Richard Pospesel (＠richard) 09 Feb '23

09 Feb '23

Richard Pospesel pushed to branch base-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 876c8a35 by cypherpunks1 at 2023-02-09T16:16:34+00:00 Bug 41565: Gate Telemetry Tasks behind MOZ_TELEMETRY_REPORTING (cherry picked from commit 47eb7d305746bd1a9e328b1fb7fef40d56769d5b) - - - - - 4 changed files: - browser/base/content/browser.js - browser/components/BrowserGlue.jsm - toolkit/components/telemetry/app/TelemetryEnvironment.jsm - toolkit/xre/nsAppRunner.cpp Changes: ===================================== browser/base/content/browser.js ===================================== @@ -6004,6 +6004,7 @@ var TabsProgressListener = { onStateChange(aBrowser, aWebProgress, aRequest, aStateFlags, aStatus) { // Collect telemetry data about tab load times. if ( + AppConstants.MOZ_TELEMETRY_REPORTING && aWebProgress.isTopLevel && (!aRequest.originalURI || aRequest.originalURI.scheme != "about") ) { ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -1668,7 +1668,9 @@ BrowserGlue.prototype = { this._firstWindowTelemetry(aWindow); this._firstWindowLoaded(); - this._collectStartupConditionsTelemetry(); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + this._collectStartupConditionsTelemetry(); + } // Set the default favicon size for UI views that use the page-icon protocol. PlacesUtils.favicons.setDefaultIconURIPreferredSize( @@ -2839,13 +2841,21 @@ BrowserGlue.prototype = { } }, - () => BrowserUsageTelemetry.reportProfileCount(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportProfileCount(); + } + }, () => OsEnvironment.reportAllowedAppSources(), () => Services.search.runBackgroundChecks(), - () => BrowserUsageTelemetry.reportInstallationTelemetry(), + () => { + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + BrowserUsageTelemetry.reportInstallationTelemetry(); + } + }, ]; for (let task of idleTasks) { ===================================== toolkit/components/telemetry/app/TelemetryEnvironment.jsm ===================================== @@ -973,7 +973,9 @@ function EnvironmentCache() { p.push(this._addonBuilder.init()); this._currentEnvironment.profile = {}; - p.push(this._updateProfile()); + if (AppConstants.MOZ_TELEMETRY_REPORTING) { + p.push(this._updateProfile()); + } if (AppConstants.MOZ_BUILD_APP == "browser") { p.push(this._loadAttributionAsync()); } ===================================== toolkit/xre/nsAppRunner.cpp ===================================== @@ -2800,7 +2800,9 @@ static ReturnAbortOnError ProfileLockedDialog(nsIFile* aProfileDir, rv = xpcom.Initialize(); NS_ENSURE_SUCCESS(rv, rv); +#if defined(MOZ_TELEMETRY_REPORTING) if (aProfileDir) mozilla::Telemetry::WriteFailedProfileLock(aProfileDir); +#endif rv = xpcom.SetWindowCreator(aNative); NS_ENSURE_SUCCESS(rv, NS_ERROR_FAILURE); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/876c8a3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/876c8a3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] fixup! Firefox preference overrides.
by Richard Pospesel (＠richard) 09 Feb '23

09 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 38384b4b by cypherpunks1 at 2023-02-09T16:15:37+00:00 fixup! Firefox preference overrides. Disable toolkit.telemetry.enabled on all builds, set webextensions.storage.sync.enabled to false (cherry picked from commit ad5720b019191e0911e11e7ea26ff32a0de132de) - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -116,7 +116,7 @@ pref("datareporting.healthreport.uploadEnabled", false); pref("datareporting.policy.dataSubmissionEnabled", false); // Make sure Unified Telemetry is really disabled, see: #18738. pref("toolkit.telemetry.unified", false); -pref("toolkit.telemetry.enabled", false); +pref("toolkit.telemetry.enabled", false, locked); pref("toolkit.telemetry.server", "data:,"); pref("toolkit.telemetry.archive.enabled", false); pref("toolkit.telemetry.updatePing.enabled", false); // Make sure updater telemetry is disabled; see #25909. @@ -419,6 +419,8 @@ pref("extensions.postDownloadThirdPartyPrompt", false); // Therefore, do not allow download of additional language packs. They are not a // privacy/security threat, we are disabling them for UX reasons. See bug 41377. pref("intl.multilingual.downloadEnabled", false); +// Disk activity: Disable storage.sync (tor-browser#41424) +pref("webextensions.storage.sync.enabled", false); // Toolbar layout pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"security-level-button\",\"new-identity-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount\":1}"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/38384b4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/38384b4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] fixup! Bug 40002: Remove about:ion
by Richard Pospesel (＠richard) 09 Feb '23

09 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 91dc58e5 by cypherpunks1 at 2023-02-09T16:15:23+00:00 fixup! Bug 40002: Remove about:ion Remove this._monitorIonPref() and this._monitorIonStudies() from BrowserGlue (cherry picked from commit fc08631d08d49082680b7133571b893242a21dd5) - - - - - 1 changed file: - browser/components/BrowserGlue.jsm Changes: ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -2375,8 +2375,6 @@ BrowserGlue.prototype = { this._monitorScreenshotsPref(); this._monitorWebcompatReporterPref(); this._monitorHTTPSOnlyPref(); - this._monitorIonPref(); - this._monitorIonStudies(); this._setupSearchDetection(); this._monitorGPCPref(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/91dc58e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/91dc58e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.8.0esr-12.0-1] fixup! Bug 31740: Remove some unnecessary RemoteSettings instances
by Richard Pospesel (＠richard) 09 Feb '23

09 Feb '23

Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 5755f0af by cypherpunks1 at 2023-02-09T16:15:07+00:00 fixup! Bug 31740: Remove some unnecessary RemoteSettings instances Disable activity stream (cherry picked from commit 9514e0c69e51e308c7706266d07465e016617b5f) - - - - - 1 changed file: - browser/components/BrowserGlue.jsm Changes: ===================================== browser/components/BrowserGlue.jsm ===================================== @@ -21,9 +21,6 @@ XPCOMUtils.defineLazyModuleGetters(this, { ActorManagerParent: "resource://gre/modules/ActorManagerParent.jsm", AddonManager: "resource://gre/modules/AddonManager.jsm", AppMenuNotifications: "resource://gre/modules/AppMenuNotifications.jsm", - ASRouterDefaultConfig: - "resource://activity-stream/lib/ASRouterDefaultConfig.jsm", - ASRouterNewTabHook: "resource://activity-stream/lib/ASRouterNewTabHook.jsm", ASRouter: "resource://activity-stream/lib/ASRouter.jsm", AsyncShutdown: "resource://gre/modules/AsyncShutdown.jsm", BackgroundUpdate: "resource://gre/modules/BackgroundUpdate.jsm", @@ -738,27 +735,6 @@ let JSWINDOWACTORS = { matches: ["about:studies*"], }, - ASRouter: { - parent: { - moduleURI: "resource:///actors/ASRouterParent.jsm", - }, - child: { - moduleURI: "resource:///actors/ASRouterChild.jsm", - events: { - // This is added so the actor instantiates immediately and makes - // methods available to the page js on load. - DOMDocElementInserted: {}, - }, - }, - matches: [ - "about:home*", - "about:newtab*", - "about:welcome*", - "about:privatebrowsing", - ], - remoteTypes: ["privilegedabout"], - }, - SwitchDocumentDirection: { child: { moduleURI: "resource:///actors/SwitchDocumentDirectionChild.jsm", @@ -2058,7 +2034,6 @@ BrowserGlue.prototype = { () => NewTabUtils.uninit(), () => Normandy.uninit(), () => RFPHelper.uninit(), - () => ASRouterNewTabHook.destroy(), () => UpdateListener.reset(), () => OnionAliasStore.uninit(), ]; @@ -2797,12 +2772,6 @@ BrowserGlue.prototype = { }, }, - { - task: () => { - ASRouterNewTabHook.createInstance(ASRouterDefaultConfig()); - }, - }, - { condition: AppConstants.MOZ_UPDATE_AGENT, task: () => { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5755f0a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/5755f0a… You're receiving this email because of your account on gitlab.torproject.org.

1 0