[Pkg-privacy-commits] [Git][pkg-privacy-team/torbrowser-launcher][debian/sid] 3 commits: New upstream version 0.3.7
Thomas Ward (@teward)
gitlab at salsa.debian.org
Thu Feb 22 21:32:19 GMT 2024
Thomas Ward pushed to branch debian/sid at Privacy Maintainers / torbrowser-launcher
Commits:
c4202556 by Thomas Ward at 2024-02-22T16:07:13-05:00
New upstream version 0.3.7
- - - - -
a5198cb1 by Thomas Ward at 2024-02-22T16:07:13-05:00
Update upstream source from tag 'upstream/0.3.7'
Update to upstream version '0.3.7'
with Debian dir d8d4c0b248e7aba2b0971a135d6de8045a2ca0b9
- - - - -
2e250cf6 by Thomas Ward at 2024-02-22T16:31:22-05:00
Update patches, debian/control. Prep for release 0.3.7-1.
- - - - -
27 changed files:
- + .github/ISSUE_TEMPLATE/bug_report.md
- BUILD.md
- CHANGELOG.md
- LICENSE
- README.md
- apparmor/torbrowser.Browser.firefox
- apparmor/torbrowser.Tor.tor
- apparmor/tunables/torbrowser
- build_rpm.sh
- debian/changelog
- debian/control
- debian/patches/01-Remove-use-of-deprecated-platform.dist-fixes-446.patch
- debian/patches/02-Update-apparmor-profile.patch
- debian/patches/03-Remove-extra-override-for-X11-sockets.patch
- debian/patches/po/02-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
- debian/patches/po/03-Add-Chinese-Traditional-translation.patch
- security_design.md
- setup.py
- share/metainfo/torbrowser.appdata.xml → share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml
- share/torbrowser-launcher/tor-browser-developers.asc
- share/torbrowser-launcher/version
- torbrowser-launcher
- torbrowser_launcher.pot
- torbrowser_launcher/__init__.py
- torbrowser_launcher/common.py
- torbrowser_launcher/launcher.py
- torbrowser_launcher/settings.py
Changes:
=====================================
.github/ISSUE_TEMPLATE/bug_report.md
=====================================
@@ -0,0 +1,11 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+_**Are you getting an error?** Sometimes updates in Tor Browser itself will break Tor Browser Launcher. There's a good chance that the problem you're experiencing has already been fixed in the [newest version](https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tags). Try installing from Flatpak (instructions below), or [build from source](/BUILD.md)._
+ - [ ] I am using the latest version and the problem persists.
=====================================
BUILD.md
=====================================
@@ -3,7 +3,7 @@
First, clone the repository:
```sh
-git clone https://github.com/micahflee/torbrowser-launcher.git
+git clone https://gitlab.torproject.org/tpo/applications/torbrowser-launcher.git
cd torbrowser-launcher
```
=====================================
CHANGELOG.md
=====================================
@@ -1,5 +1,19 @@
# Tor Browser Launcher Changelog
+## 0.3.7
+
+* Use Tor Browser 13.0 new filenames
+* Adapt AppArmor profile for Tor Browser 13.0
+* Set the TORBROWSER_LAUNCHER environment variable to make it easier
+ for Tor Browser to see that it is being run by torbrowser-launcher
+* Use a proper rDNS ID in AppStream metainfo
+* Update to latest version of the Tor Browser OpenPGP signing key
+* Remove some unused code to fix a warning
+* Add dbus-glib to the rpm package dependencies
+* Maintenance of torbrowser-launcher has been handed to Tor Project,
+ and the git repository moved to
+ https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
+
## 0.3.6
* Tor Browser 12.0 no longer uses locales, so the download URL and local path have changed
=====================================
LICENSE
=====================================
@@ -1,4 +1,5 @@
-Copyright (c) 2013-2022 Micah Lee <micah at micahflee.com>
+Copyright (c) 2013-2023 Micah Lee <micah at micahflee.com>
+Copyright (c) 2024 Tor Project
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
=====================================
README.md
=====================================
@@ -1,11 +1,11 @@
# Tor Browser Launcher
-_**Are you getting an error?** Sometimes updates in Tor Browser itself will break Tor Browser Launcher. There's a good chance that the problem you're experiencing has already been fixed in the [newest version](https://github.com/micahflee/torbrowser-launcher/releases). Try installing from Flatpak (instructions below), or [build from source](/BUILD.md)._
+_**Are you getting an error?** Sometimes updates in Tor Browser itself will break Tor Browser Launcher. There's a good chance that the problem you're experiencing has already been fixed in the [newest version](https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/tags). Try installing from Flatpak (instructions below), or [build from source](/BUILD.md)._
Tor Browser Launcher is intended to make Tor Browser easier to install and use for GNU/Linux users. You install ```torbrowser-launcher``` from your distribution's package manager and it handles everything else:
* Downloads and installs the most recent version of Tor Browser in your language and for your computer's architecture, or launches Tor Browser if it's already installed (Tor Browser will automatically update itself)
-* Verifies Tor Browser's [signature](https://www.torproject.org/docs/verifying-signatures.html.en) for you, to ensure the version you downloaded was cryptographically signed by Tor developers and was not tampered with
+* Verifies Tor Browser's [signature](https://support.torproject.org/tbb/how-to-verify-signature/) for you, to ensure the version you downloaded was cryptographically signed by Tor developers and was not tampered with
* Adds "Tor Browser" and "Tor Browser Launcher Settings" application launcher to your desktop environment's menu
* Includes AppArmor profiles to make a Tor Browser compromise not as bad
* Optionally plays a modem sound when you open Tor Browser (because Tor is so slow)
=====================================
apparmor/torbrowser.Browser.firefox
=====================================
@@ -1,7 +1,7 @@
#include <tunables/global>
#include <tunables/torbrowser>
-@{torbrowser_firefox_executable} = /home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/firefox.real
+@{torbrowser_firefox_executable} = /home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser/Browser/firefox.real
profile torbrowser_firefox @{torbrowser_firefox_executable} {
#include <abstractions/audio>
@@ -12,6 +12,8 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
#include <abstractions/opencl>
#include if exists <abstractions/vulkan>
+ deny capability sys_ptrace,
+
# Uncomment the following lines if you want to give the Tor Browser read-write
# access to most of your personal files.
# #include <abstractions/user-download>
@@ -46,10 +48,13 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
owner @{PROC}/@{pid}/environ r,
owner @{PROC}/@{pid}/fd/ r,
owner @{PROC}/@{pid}/mountinfo r,
+ owner @{PROC}/@{pid}/oom_score_adj rw,
owner @{PROC}/@{pid}/smaps r,
owner @{PROC}/@{pid}/stat r,
owner @{PROC}/@{pid}/statm r,
owner @{PROC}/@{pid}/status r,
+ owner @{PROC}/@{pid}/task/ r,
+ owner @{PROC}/@{pid}/task/*/comm r,
owner @{PROC}/@{pid}/task/*/stat r,
@{PROC}/sys/kernel/random/uuid r,
@@ -70,6 +75,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
owner @{torbrowser_home_dir}/Downloads/ rwk,
owner @{torbrowser_home_dir}/Downloads/** rwk,
owner @{torbrowser_home_dir}/firefox rix,
+ owner @{torbrowser_home_dir}/glxtest ix,
owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/* rw,
owner @{torbrowser_home_dir}/{,TorBrowser/UpdateInfo/}updates/[0-9]*/{,MozUpdater/bgupdate/}updater ix,
owner @{torbrowser_home_dir}/updater ix,
@@ -111,6 +117,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
/sys/devices/system/node/ r,
/sys/devices/system/node/node[0-9]*/meminfo r,
/sys/fs/cgroup/cpu,cpuacct/{,user.slice/}cpu.cfs_quota_us r,
+ deny /sys/class/input/ r,
deny /sys/devices/virtual/block/*/uevent r,
# Should use abstractions/gstreamer instead once merged upstream
=====================================
apparmor/torbrowser.Tor.tor
=====================================
@@ -1,7 +1,7 @@
#include <tunables/global>
#include <tunables/torbrowser>
-@{torbrowser_tor_executable} = /home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*/Browser/TorBrowser/Tor/tor
+@{torbrowser_tor_executable} = /home/*/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser/Browser/TorBrowser/Tor/tor
profile torbrowser_tor @{torbrowser_tor_executable} {
#include <abstractions/base>
=====================================
apparmor/tunables/torbrowser
=====================================
@@ -1,2 +1,2 @@
-@{torbrowser_installation_dir}=@{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser_*
+@{torbrowser_installation_dir}=@{HOME}/.local/share/torbrowser/tbb/{i686,x86_64}/tor-browser
@{torbrowser_home_dir}=@{torbrowser_installation_dir}/Browser
=====================================
build_rpm.sh
=====================================
@@ -6,7 +6,7 @@ VERSION=$(cat share/torbrowser-launcher/version)
rm -r build dist
# build binary package
-python3 setup.py bdist_rpm --requires="python3-qt5, python3-gpg, python3-requests, python3-pysocks, python3-packaging, gnupg2"
+python3 setup.py bdist_rpm --requires="python3-qt5, python3-gpg, python3-requests, python3-pysocks, python3-packaging, gnupg2, dbus-glib"
# install it
echo ""
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+torbrowser-launcher (0.3.7-1) unstable; urgency=medium
+
+ * New upstream release (0.3.7)
+ * debian/patches:
+ - Refresh patches
+ - po/02 patch: Modify patch paths to use new upstream pathing for
+ metadata.
+ * d/control:
+ - Update uploaders to include new uploader.
+
+ -- Thomas Ward <teward at ubuntu.com> Thu, 22 Feb 2024 16:28:06 -0500
+
torbrowser-launcher (0.3.6-2) unstable; urgency=medium
* debian/patches:
=====================================
debian/control
=====================================
@@ -1,6 +1,7 @@
Source: torbrowser-launcher
Maintainer: Debian Privacy Tools Maintainers <pkg-privacy-maintainers at lists.alioth.debian.org>
Uploaders: Roger Shimizu <rosh at debian.org>
+ Thomas Ward <teward at ubuntu.com>
Section: contrib/web
Priority: optional
Build-Depends:
=====================================
debian/patches/01-Remove-use-of-deprecated-platform.dist-fixes-446.patch
=====================================
@@ -10,11 +10,9 @@ is no longer necessary, so just remove the use altogether.
setup.py | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
-diff --git a/setup.py b/setup.py
-index 8d8fa7d..0b259aa 100644
--- a/setup.py
+++ b/setup.py
-@@ -74,24 +74,22 @@ for root, dirs, files in os.walk(SHARE):
+@@ -75,24 +75,22 @@
if files:
datafiles.append((root, [os.path.join(root, f) for f in files]))
=====================================
debian/patches/02-Update-apparmor-profile.patch
=====================================
@@ -7,11 +7,9 @@ Subject: Update apparmor profile
apparmor/torbrowser.Tor.tor | 1 +
2 files changed, 2 insertions(+)
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index 85a0d82..fa754b0 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
-@@ -99,6 +99,7 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+@@ -105,6 +105,7 @@
/usr/share/gnome/applications/ r,
/usr/share/gnome/applications/kde4/ r,
/usr/share/poppler/cMap/ r,
@@ -19,11 +17,9 @@ index 85a0d82..fa754b0 100644
# Distribution homepage
/usr/share/homepage/ r,
-diff --git a/apparmor/torbrowser.Tor.tor b/apparmor/torbrowser.Tor.tor
-index f5b8177..e455ce9 100644
--- a/apparmor/torbrowser.Tor.tor
+++ b/apparmor/torbrowser.Tor.tor
-@@ -38,6 +38,7 @@ profile torbrowser_tor @{torbrowser_tor_executable} {
+@@ -38,6 +38,7 @@
@{PROC}/sys/kernel/random/uuid r,
/sys/devices/system/cpu/ r,
=====================================
debian/patches/03-Remove-extra-override-for-X11-sockets.patch
=====================================
@@ -10,16 +10,14 @@ The regression in X11 abstractions has been fixed in upstream apparmor, and is b
apparmor/torbrowser.Browser.firefox | 2 ++
1 file changed, 2 insertions(+)
-diff --git a/apparmor/torbrowser.Browser.firefox b/apparmor/torbrowser.Browser.firefox
-index fa754b0..0048dbe 100644
--- a/apparmor/torbrowser.Browser.firefox
+++ b/apparmor/torbrowser.Browser.firefox
-@@ -11,6 +11,8 @@ profile torbrowser_firefox @{torbrowser_firefox_executable} {
+@@ -11,6 +11,8 @@
#include <abstractions/mesa>
#include <abstractions/opencl>
#include if exists <abstractions/vulkan>
+ #include if exists <abstractions/dbus-session>
+ #include if exists <abstractions/X>
- # Uncomment the following lines if you want to give the Tor Browser read-write
- # access to most of your personal files.
+ deny capability sys_ptrace,
+
=====================================
debian/patches/po/02-Remove-mention-of-modem-sound-in-docs-and-translatio.patch
=====================================
@@ -12,37 +12,33 @@ Origin: https://bugs.debian.org/913151
po/pt_BR.po | 8 --------
po/ru.po | 7 -------
po/sv.po | 8 --------
- share/metainfo/torbrowser.appdata.xml | 1 -
+ share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml | 1 -
9 files changed, 50 deletions(-)
-diff --git a/README.md b/README.md
-index 3e5a4ad..4f42a08 100644
--- a/README.md
+++ b/README.md
-@@ -8,7 +8,6 @@ Tor Browser Launcher is intended to make Tor Browser easier to install and use f
- * Verifies Tor Browser's [signature](https://www.torproject.org/docs/verifying-signatures.html.en) for you, to ensure the version you downloaded was cryptographically signed by Tor developers and was not tampered with
+@@ -8,7 +8,6 @@
+ * Verifies Tor Browser's [signature](https://support.torproject.org/tbb/how-to-verify-signature/) for you, to ensure the version you downloaded was cryptographically signed by Tor developers and was not tampered with
* Adds "Tor Browser" and "Tor Browser Launcher Settings" application launcher to your desktop environment's menu
* Includes AppArmor profiles to make a Tor Browser compromise not as bad
-* Optionally plays a modem sound when you open Tor Browser (because Tor is so slow)
Tor Browser Launcher is included in Ubuntu, Debian, and Fedora. To install it in any other distribution, see the [build instructions](/BUILD.md).
-diff --git a/po/cs.po b/po/cs.po
-index 9e9e1a0..6a37deb 100644
--- a/po/cs.po
+++ b/po/cs.po
-@@ -283,10 +283,6 @@ msgstr "Uložit a ukončit"
- #~ "Možná je na vás veden útok, anebo může jít pouze o síťovou závadu. Pro "
+@@ -284,10 +284,6 @@
#~ "nové stažení klikněte na Spustit."
--#~ msgid ""
+ #~ msgid ""
-#~ "The python-pygame package is missing, the modem sound is unavailable."
-#~ msgstr "Chybí balíček python-pygame, zvuk modemu není dostupný."
-
- #~ msgid ""
+-#~ msgid ""
#~ "This option is only available when using a system wide Tor installation."
#~ msgstr ""
-@@ -295,8 +291,5 @@ msgstr "Uložit a ukončit"
+ #~ "Tato možnost je dostupná, pouze pokud se používá systémová instalace Toru."
+@@ -295,8 +291,5 @@
#~ msgid "This option requires the python-txsocksx package."
#~ msgstr "Tato možnost vyžaduje balíček python-txsocksx."
@@ -51,23 +47,21 @@ index 9e9e1a0..6a37deb 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Tato možnost vyžaduje nainstalovaný python-pygame"
-diff --git a/po/fr.po b/po/fr.po
-index 7b0d9b1..c0b60be 100644
--- a/po/fr.po
+++ b/po/fr.po
-@@ -288,11 +288,6 @@ msgstr "Enregistrer et quitter"
- #~ "Vous pourriez être l'objet d'une attaque, ou il peut s'agir d'un problème "
+@@ -289,11 +289,6 @@
#~ "de réseau. Cliquer sur Démarrer pour télécharger à nouveau."
--#~ msgid ""
+ #~ msgid ""
-#~ "The python-pygame package is missing, the modem sound is unavailable."
-#~ msgstr ""
-#~ "Le paquet python-pygame est manquant, le son de modem est indisponible."
-
- #~ msgid ""
+-#~ msgid ""
#~ "This option is only available when using a system wide Tor installation."
#~ msgstr ""
-@@ -302,8 +297,5 @@ msgstr "Enregistrer et quitter"
+ #~ "Cette option n'est disponible qu'en conjonction avec une installation "
+@@ -302,8 +297,5 @@
#~ msgid "This option requires the python-txsocksx package."
#~ msgstr "Cette option nécessite le paquet python-txsocksx"
@@ -76,22 +70,20 @@ index 7b0d9b1..c0b60be 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Cette option requiert le paquet python-pygame"
-diff --git a/po/hu.po b/po/hu.po
-index 533ba6a..ad73b40 100644
--- a/po/hu.po
+++ b/po/hu.po
-@@ -285,10 +285,6 @@ msgstr "Mentés és kilépés"
- #~ "Lehet, hogy támadás alatt vagy, vagy előfordulhat egy hálózati probléma "
+@@ -286,10 +286,6 @@
#~ "is. Kattints az indításra az újbóli letöltéshez."
--#~ msgid ""
+ #~ msgid ""
-#~ "The python-pygame package is missing, the modem sound is unavailable."
-#~ msgstr "A python-pygame csomag nem található, a modem hang nem elérhető."
-
- #~ msgid ""
+-#~ msgid ""
#~ "This option is only available when using a system wide Tor installation."
#~ msgstr ""
-@@ -298,8 +294,5 @@ msgstr "Mentés és kilépés"
+ #~ "Ehhez az opció akkor elérhető amikor használatban van a rendszer szintű "
+@@ -298,8 +294,5 @@
#~ msgid "This option requires the python-txsocksx package."
#~ msgstr "Ehhez az opcióhoz szükséges a python-txsocksx csomag"
@@ -100,11 +92,9 @@ index 533ba6a..ad73b40 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Ehhez az opcióhoz szükséges hogy a python-pygame telepítve legyen"
-diff --git a/po/nl.po b/po/nl.po
-index 2f89e3a..ddca8b9 100644
--- a/po/nl.po
+++ b/po/nl.po
-@@ -268,8 +268,5 @@ msgstr "Opslaan & afsluiten"
+@@ -268,8 +268,5 @@
#~ msgid "This option requires the python-txsocksx package."
#~ msgstr "Voor deze optie is het python-txsocksx pakket nodig."
@@ -113,23 +103,21 @@ index 2f89e3a..ddca8b9 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Voor deze optie moet python-pygame geïnstalleerd zijn"
-diff --git a/po/pt_BR.po b/po/pt_BR.po
-index f81f21b..9b60394 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
-@@ -288,11 +288,6 @@ msgstr "Salvar && Sair"
- #~ "Você pode estar sob ataque, ou pode haver apenas um problema de rede. "
+@@ -289,11 +289,6 @@
#~ "Clique em Iniciar para tentar baixar novamente."
--#~ msgid ""
+ #~ msgid ""
-#~ "The python-pygame package is missing, the modem sound is unavailable."
-#~ msgstr ""
-#~ "O pacote python-pygame está faltando, o som do modem não está disponível."
-
- #~ msgid ""
+-#~ msgid ""
#~ "This option is only available when using a system wide Tor installation."
#~ msgstr ""
-@@ -301,8 +296,5 @@ msgstr "Salvar && Sair"
+ #~ "Esta opção está apenas disponível ao usar uma instalação Tor do sistema."
+@@ -301,8 +296,5 @@
#~ msgid "This option requires the python-txsocksx package."
#~ msgstr "Esta opção precisa do pacote python-txsocksx"
@@ -138,22 +126,19 @@ index f81f21b..9b60394 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Esta opção precisa do pacote python-pygame"
-diff --git a/po/ru.po b/po/ru.po
-index e4d5dc3..a9d0a37 100644
--- a/po/ru.po
+++ b/po/ru.po
-@@ -285,10 +285,6 @@ msgstr "Сохранить и выйти"
- #~ "Вы можете бы быть под атакой, или имеют место проблемы с сетью. Нажмите "
+@@ -286,18 +286,11 @@
#~ "кнопку Пуск и попробуйте снова."
--#~ msgid ""
+ #~ msgid ""
-#~ "The python-pygame package is missing, the modem sound is unavailable."
-#~ msgstr "Пакет python-pygame не найден, звуки модема недоступны."
-
- #~ msgid ""
+-#~ msgid ""
#~ "This option is only available when using a system wide Tor installation."
#~ msgstr "Эта опция доступна только при установки Tor в систему."
-@@ -296,8 +292,5 @@ msgstr "Сохранить и выйти"
+
#~ msgid "This option requires the python-txsocksx package."
#~ msgstr "Эта опция требует пакет python-txsocksx."
@@ -162,23 +147,21 @@ index e4d5dc3..a9d0a37 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Эта опция требует установленный python-pygame"
-diff --git a/po/sv.po b/po/sv.po
-index 385e2be..672da78 100644
--- a/po/sv.po
+++ b/po/sv.po
-@@ -285,11 +285,6 @@ msgstr "Spara && avsluta"
- #~ "Du kan vara under attack, eller det kan bara vara ett nätverksproblem. "
+@@ -286,11 +286,6 @@
#~ "Klicka på Start för försöka hämta igen."
--#~ msgid ""
+ #~ msgid ""
-#~ "The python-pygame package is missing, the modem sound is unavailable."
-#~ msgstr ""
-#~ "Python-pygame-paketet saknas, modemljudet är otillgängligt."
-
- #~ msgid ""
+-#~ msgid ""
#~ "This option is only available when using a system wide Tor installation."
#~ msgstr ""
-@@ -299,8 +294,5 @@ msgstr "Spara && avsluta"
+ #~ "Det här alternativet är endast tillgängligt när du använder en "
+@@ -299,8 +294,5 @@
#~ msgid "This option requires the python-txsocksx package."
#~ msgstr "Det här alternativet kräver python-txsocksx-paketet."
@@ -187,11 +170,9 @@ index 385e2be..672da78 100644
-
#~ msgid "This option requires python-pygame to be installed"
#~ msgstr "Det här alternativet kräver att python-pygame installeras"
-diff --git a/share/metainfo/torbrowser.appdata.xml b/share/metainfo/torbrowser.appdata.xml
-index fe0ab9e..efdaf2d 100644
---- a/share/metainfo/torbrowser.appdata.xml
-+++ b/share/metainfo/torbrowser.appdata.xml
-@@ -16,7 +16,6 @@
+--- a/share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml
++++ b/share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml
+@@ -18,7 +18,6 @@
<li>Includes AppArmor profiles to make a Tor Browser compromise not as bad (in some distros)</li>
<li>Adding a Tor Browser application launcher to your desktop environment's menu</li>
<li>Lets you set Tor Browser as your default browser</li>
=====================================
debian/patches/po/03-Add-Chinese-Traditional-translation.patch
=====================================
@@ -9,11 +9,259 @@ Origin: https://github.com/micahflee/torbrowser-launcher/pull/465
1 file changed, 1 insertion(+)
create mode 120000 po/zh.po
-diff --git a/po/zh.po b/po/zh.po
-new file mode 120000
-index 0000000..8fc9571
--- /dev/null
+++ b/po/zh.po
-@@ -0,0 +1 @@
-+zh_TW.po
-\ No newline at end of file
+@@ -0,0 +1,253 @@
++# Chinese translations for PACKAGE package
++# PACKAGE 套件的正體中文翻譯.
++# Copyright (C) 2020 THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# Koala Yeung <koalay at gmail.com>, 2020.
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: \n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2018-03-23 15:47-0700\n"
++"PO-Revision-Date: 2020-04-22 23:31+0800\n"
++"Last-Translator: Koala Yeung <koalay at gmail.com>\n"
++"Language-Team: Chinese (traditional)\n"
++"Language: zh_TW\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: Poedit 2.3\n"
++
++#: __init__.py:65 launcher.py:470
++msgid "Tor Browser Launcher"
++msgstr "Tor 瀏覽器啟動程式"
++
++#: __init__.py:66
++msgid "By Micah Lee, licensed under MIT"
++msgstr "由 Micah Lee 編寫，以 MIT 特許授權發佈"
++
++#: __init__.py:67
++#, python-brace-format
++msgid "version {0}"
++msgstr "{0} 版"
++
++#: common.py:100
++#, python-brace-format
++msgid "Error creating {0}"
++msgstr "生成 {0} 時發生問題"
++
++#: common.py:102 common.py:180
++#, python-brace-format
++msgid "{0} is not writable"
++msgstr "無法寫入 {0}"
++
++#: common.py:177
++#, python-brace-format
++msgid "Cannot create directory {0}"
++msgstr "無法生成 {0} 目錄"
++
++#: common.py:187
++msgid "Creating GnuPG homedir"
++msgstr "生成 GnuPG 目錄"
++
++#: common.py:254
++#, python-format
++msgid "Could not import key with fingerprint: %s."
++msgstr "無法以指紋匯入加密金鑰︰%s."
++
++#: common.py:259
++msgid "Not all keys were imported successfully!"
++msgstr "只有部份加密金鑰加入成功！"
++
++#: launcher.py:83
++msgid "Downloading Tor Browser for the first time."
++msgstr "第一次下載 Tor 瀏覽器。"
++
++#: launcher.py:85
++msgid ""
++"Your version of Tor Browser is out-of-date. Downloading the newest version."
++msgstr "你目前的 Tor 瀏覽器不是最新的，正下載最新版本。"
++
++#: launcher.py:100
++msgid "Downloading over Tor"
++msgstr "透過 Tor 網絡下載"
++
++#: launcher.py:111
++msgid "Tor Browser"
++msgstr "Tor 瀏覽器"
++
++#: launcher.py:128
++msgid "Start"
++msgstr "開始"
++
++#: launcher.py:174
++msgid "Yes"
++msgstr "是"
++
++#: launcher.py:178
++msgid "Exit"
++msgstr "離開"
++
++#: launcher.py:192 settings.py:136
++msgid "Cancel"
++msgstr "取消"
++
++#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
++#: launcher.py:281
++msgid "Downloading"
++msgstr "下載中"
++
++#: launcher.py:238
++msgid "Latest version: {}"
++msgstr "最新版本︰{}"
++
++#: launcher.py:241
++msgid "Error detecting Tor Browser version."
++msgstr "偵測 Tor 瀏覽器版本時發生錯誤。"
++
++#: launcher.py:256 launcher.py:357
++msgid "Verifying Signature"
++msgstr "正在檢查數位簽章"
++
++#: launcher.py:260
++msgid "Extracting"
++msgstr "正在解開"
++
++#: launcher.py:264
++msgid "Running"
++msgstr "執行中"
++
++#: launcher.py:268
++msgid "Starting download over again"
++msgstr "從新開始下載"
++
++#: launcher.py:279 launcher.py:295
++msgid "(over Tor)"
++msgstr "(透過 Tor 網絡)"
++
++#: launcher.py:293
++msgid "Downloaded"
++msgstr "已下載"
++
++#: launcher.py:393
++msgid "Installing"
++msgstr "正在安裝"
++
++#: launcher.py:401
++#, python-brace-format
++msgid "Tor Browser Launcher doesn't understand the file format of {0}"
++msgstr "Tor 瀏覽器啟動程式不了解 {0} 的檔案格式"
++
++#: launcher.py:427
++msgid ""
++"The version of Tor Browser you have installed is earlier than it should be, "
++"which could be a sign of an attack!"
++msgstr "你已安裝的 Tor 瀏覽器版本比預期的版本早期，這表示你的電腦可能被入侵！"
++
++#: launcher.py:446
++msgid "Downloading Tor Browser over again."
++msgstr "重新下載 Tor 瀏覽器。"
++
++#: launcher.py:516 launcher.py:525 launcher.py:533
++msgid "Download Error:"
++msgstr "下載錯誤:"
++
++#: launcher.py:517
++msgid "You are currently using a non-default mirror"
++msgstr "你目前正在使用非預設的鏡像"
++
++#: launcher.py:518
++msgid "Would you like to switch back to the default?"
++msgstr "你想改為使用預設的嗎？"
++
++#: launcher.py:527
++msgid "Would you like to try the English version of Tor Browser instead?"
++msgstr "你要試試改為下載英文版 Tor 瀏覽器嗎？"
++
++#: launcher.py:548
++#, python-brace-format
++msgid ""
++"Invalid SSL certificate for:\n"
++"{0}\n"
++"\n"
++"You may be under attack."
++msgstr ""
++"以下網址的 SSL 證書不正確︰\n"
++"{0}\n"
++"\n"
++"你可能正被入侵。"
++
++#: launcher.py:550
++msgid "Try the download again using Tor?"
++msgstr "要試試改用 Tor 網絡重新下載嗎？"
++
++#: launcher.py:559
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Trying to download over Tor. Are you sure Tor is configured correctly and "
++"running?"
++msgstr ""
++"無法開始下載︰\n"
++"\n"
++"{0}\n"
++"\n"
++"請試試經由 Tor 網絡下載。你肯定你的 Tor 有正確被下載和執行嗎？"
++
++#: launcher.py:563
++#, python-brace-format
++msgid ""
++"Error starting download:\n"
++"\n"
++"{0}\n"
++"\n"
++"Are you connected to the internet?"
++msgstr ""
++"無法開始下載︰\n"
++"\n"
++"{0}\n"
++"\n"
++"請問你是否有連上互聯網？"
++
++#: settings.py:46
++msgid "Tor Browser Launcher Settings"
++msgstr "Tor 瀏覽器啟動程式設定"
++
++#: settings.py:50
++msgid "Download over system Tor"
++msgstr "透過系統的 Tor 網絡下載"
++
++#: settings.py:57
++msgid "Force downloading English version of Tor Browser"
++msgstr "強制下載英文版本的 Tor 瀏覽器"
++
++#: settings.py:66
++msgid "Tor server"
++msgstr "Tor 伺服器"
++
++#: settings.py:82
++msgid "Status: Installed"
++msgstr "狀態︰已安裝"
++
++#: settings.py:84
++msgid "Status: Not Installed"
++msgstr "狀態︰未安裝"
++
++#: settings.py:87
++msgid "Install Tor Browser"
++msgstr "安裝 Tor 瀏覽器"
++
++#: settings.py:92
++msgid "Reinstall Tor Browser"
++msgstr "重新安裝 Tor 瀏覽器"
++
++#: settings.py:115
++msgid "Mirror"
++msgstr "鏡像"
++
++#: settings.py:131
++msgid "Save && Exit"
++msgstr "儲存及離開"
=====================================
security_design.md
=====================================
@@ -10,7 +10,7 @@ torbrowser-launcher doesn't rely on the CA infrastructure. The only TLS it does
## Downgrade attacks
-Downgrade attacks shouldn't be possible, unless they're committed by Tor devs themselves. If an attacker captures a valid old request to https://check.torproject.org/RecommendedTBBVersions that claims that the current version is an older version than what's currently installed, torbrowser-launcher prevents it from installing. (And by "installing" I mean extracting to the user's home dir.)
+Downgrade attacks shouldn't be possible, unless they're committed by Tor devs themselves. If an attacker captures a valid old request to https://aus1.torproject.org/torbrowser/update_3/release/Linux_x86_64-gcc3/x/ALL that claims that the current version is an older version than what's currently installed, torbrowser-launcher prevents it from installing. (And by "installing" I mean extracting to the user's home dir.)
However, there is the scenario where the user has set a third-party mirror to download from instead of the default. The third-party mirror could serve a tarball and sig that have filenames of the latest version, but are actually an older version. This attack is mitigated by the fact that all mirror options use HTTPS -- though none of the mirror certs are pinned, so in this case it would rely on CA infrastructure. This is an edge case, and would only work against users who are using a non-default mirror, and who also have access to a trusted CA signing key.
=====================================
setup.py
=====================================
@@ -1,8 +1,9 @@
"""
Tor Browser Launcher
-https://github.com/micahflee/torbrowser-launcher/
+https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
-Copyright (c) 2013-2017 Micah Lee <micah at micahflee.com>
+Copyright (c) 2013-2023 Micah Lee <micah at micahflee.com>
+Copyright (c) 2024 Tor Project
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -100,7 +101,9 @@ setup(
version=version,
author="Micah Lee",
author_email="micah at micahflee.com",
- url="https://www.github.com/micahflee/torbrowser-launcher",
+ maintainer="Nicolas Vigier",
+ maintainer_email="boklm at torproject.org",
+ url="https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/",
platforms=["GNU/Linux"],
license="MIT",
description="A program to help you securely download and run Tor Browser",
=====================================
share/metainfo/torbrowser.appdata.xml → share/metainfo/org.torproject.torbrowser-launcher.metainfo.xml
=====================================
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Micah Lee <micah at micahflee.com> -->
+<!-- Copyright 2014-2023 Micah Lee <micah at micahflee.com> -->
+<!-- Copyright 2024 Tor Project -->
<component type="desktop-application">
- <id>torbrowser.desktop</id>
+ <id>org.torproject.torbrowser-launcher</id>
+ <launchable type="desktop-id">torbrowser.desktop</launchable>
<metadata_license>CC0-1.0</metadata_license>
<project_license>MIT</project_license>
<name>Tor Browser Launcher</name>
@@ -21,14 +23,15 @@
</description>
<screenshots>
<screenshot type="default">
- <image>https://raw.githubusercontent.com/micahflee/torbrowser-launcher/master/screenshot.png</image>
+ <image>https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/raw/main/screenshot.png</image>
<caption>Window to change Tor Browser Launcher settings</caption>
</screenshot>
</screenshots>
- <url type="homepage">https://github.com/micahflee/torbrowser-launcher</url>
- <update_contact>micah at micahflee.com</update_contact>
+ <url type="homepage">https://gitlab.torproject.org/tpo/applications/torbrowser-launcher</url>
+ <update_contact>boklm at torproject.org</update_contact>
<content_rating type="oars-1.1"/>
<releases>
+ <release version="0.3.7" date="2024-01-12"/>
<release version="0.3.6" date="2022-12-13"/>
</releases>
</component>
=====================================
share/torbrowser-launcher/tor-browser-developers.asc
=====================================
@@ -70,40 +70,40 @@ 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
-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
-=GYln
+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
+=pesg
-----END PGP PUBLIC KEY BLOCK-----
=====================================
share/torbrowser-launcher/version
=====================================
@@ -1 +1 @@
-0.3.6
+0.3.7
=====================================
torbrowser-launcher
=====================================
@@ -1,9 +1,10 @@
#!/usr/bin/env python3
"""
Tor Browser Launcher
-https://github.com/micahflee/torbrowser-launcher/
+https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
-Copyright (c) 2013-2017 Micah Lee <micah at micahflee.com>
+Copyright (c) 2013-2023 Micah Lee <micah at micahflee.com>
+Copyright (c) 2024 Tor Project
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
=====================================
torbrowser_launcher.pot
=====================================
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-23 15:47-0700\n"
+"POT-Creation-Date: 2024-01-09 17:04+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -17,153 +17,154 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: __init__.py:65 launcher.py:470
+#: __init__.py:76 launcher.py:520
msgid "Tor Browser Launcher"
msgstr ""
-#: __init__.py:66
-msgid "By Micah Lee, licensed under MIT"
+#: __init__.py:77
+msgid "By Micah Lee & Tor Project, licensed under MIT"
msgstr ""
-#: __init__.py:67
+#: __init__.py:78
#, python-brace-format
msgid "version {0}"
msgstr ""
-#: common.py:100
+#: common.py:90
#, python-brace-format
msgid "Error creating {0}"
msgstr ""
-#: common.py:102 common.py:180
+#: common.py:187
#, python-brace-format
-msgid "{0} is not writable"
+msgid "Renamed {0} to {1}"
msgstr ""
-#: common.py:177
+#: common.py:201
#, python-brace-format
msgid "Cannot create directory {0}"
msgstr ""
-#: common.py:187
+#: common.py:204
+#, python-brace-format
+msgid "{0} is not writable"
+msgstr ""
+
+#: common.py:211
msgid "Creating GnuPG homedir"
msgstr ""
-#: common.py:254
+#: common.py:302
#, python-format
msgid "Could not import key with fingerprint: %s."
msgstr ""
-#: common.py:259
+#: common.py:309
msgid "Not all keys were imported successfully!"
msgstr ""
-#: launcher.py:83
+#: launcher.py:87
msgid "Downloading Tor Browser for the first time."
msgstr ""
-#: launcher.py:85
+#: launcher.py:90
msgid ""
"Your version of Tor Browser is out-of-date. Downloading the newest version."
msgstr ""
-#: launcher.py:100
+#: launcher.py:111
msgid "Downloading over Tor"
msgstr ""
-#: launcher.py:111
+#: launcher.py:122
msgid "Tor Browser"
msgstr ""
-#: launcher.py:128
+#: launcher.py:141
msgid "Start"
msgstr ""
-#: launcher.py:174
+#: launcher.py:191
msgid "Yes"
msgstr ""
-#: launcher.py:178
+#: launcher.py:195
msgid "Exit"
msgstr ""
-#: launcher.py:192 settings.py:136
+#: launcher.py:209 settings.py:136
msgid "Cancel"
msgstr ""
-#: launcher.py:231 launcher.py:245 launcher.py:249 launcher.py:279
-#: launcher.py:281
+#: launcher.py:246 launcher.py:267 launcher.py:276 launcher.py:315
+#: launcher.py:318
msgid "Downloading"
msgstr ""
-#: launcher.py:238
+#: launcher.py:257
msgid "Latest version: {}"
msgstr ""
-#: launcher.py:241
+#: launcher.py:261
msgid "Error detecting Tor Browser version."
msgstr ""
-#: launcher.py:256 launcher.py:357
+#: launcher.py:291 launcher.py:389
msgid "Verifying Signature"
msgstr ""
-#: launcher.py:260
+#: launcher.py:295
msgid "Extracting"
msgstr ""
-#: launcher.py:264
+#: launcher.py:299
msgid "Running"
msgstr ""
-#: launcher.py:268
+#: launcher.py:303
msgid "Starting download over again"
msgstr ""
-#: launcher.py:279 launcher.py:295
+#: launcher.py:315 launcher.py:334
msgid "(over Tor)"
msgstr ""
-#: launcher.py:293
+#: launcher.py:330
msgid "Downloaded"
msgstr ""
-#: launcher.py:393
+#: launcher.py:431
msgid "Installing"
msgstr ""
-#: launcher.py:401
+#: launcher.py:440
#, python-brace-format
msgid "Tor Browser Launcher doesn't understand the file format of {0}"
msgstr ""
-#: launcher.py:427
+#: launcher.py:471
msgid ""
"The version of Tor Browser you have installed is earlier than it should be, "
"which could be a sign of an attack!"
msgstr ""
-#: launcher.py:446
+#: launcher.py:488
msgid "Downloading Tor Browser over again."
msgstr ""
-#: launcher.py:516 launcher.py:525 launcher.py:533
+#: launcher.py:561 launcher.py:569
msgid "Download Error:"
msgstr ""
-#: launcher.py:517
+#: launcher.py:563
msgid "You are currently using a non-default mirror"
msgstr ""
-#: launcher.py:518
+#: launcher.py:565
msgid "Would you like to switch back to the default?"
msgstr ""
-#: launcher.py:527
-msgid "Would you like to try the English version of Tor Browser instead?"
-msgstr ""
-
-#: launcher.py:548
+#: launcher.py:585
#, python-brace-format
msgid ""
"Invalid SSL certificate for:\n"
@@ -172,11 +173,11 @@ msgid ""
"You may be under attack."
msgstr ""
-#: launcher.py:550
+#: launcher.py:588
msgid "Try the download again using Tor?"
msgstr ""
-#: launcher.py:559
+#: launcher.py:598
#, python-brace-format
msgid ""
"Error starting download:\n"
@@ -187,7 +188,7 @@ msgid ""
"running?"
msgstr ""
-#: launcher.py:563
+#: launcher.py:604
#, python-brace-format
msgid ""
"Error starting download:\n"
@@ -197,42 +198,38 @@ msgid ""
"Are you connected to the internet?"
msgstr ""
-#: settings.py:46
+#: settings.py:48
msgid "Tor Browser Launcher Settings"
msgstr ""
-#: settings.py:50
+#: settings.py:52
msgid "Download over system Tor"
msgstr ""
-#: settings.py:57
-msgid "Force downloading English version of Tor Browser"
-msgstr ""
-
-#: settings.py:66
+#: settings.py:59
msgid "Tor server"
msgstr ""
-#: settings.py:82
+#: settings.py:74
msgid "Status: Installed"
msgstr ""
-#: settings.py:84
+#: settings.py:76
msgid "Status: Not Installed"
msgstr ""
-#: settings.py:87
+#: settings.py:79
msgid "Install Tor Browser"
msgstr ""
-#: settings.py:92
+#: settings.py:86
msgid "Reinstall Tor Browser"
msgstr ""
-#: settings.py:115
+#: settings.py:111
msgid "Mirror"
msgstr ""
-#: settings.py:131
+#: settings.py:129
msgid "Save && Exit"
msgstr ""
=====================================
torbrowser_launcher/__init__.py
=====================================
@@ -1,8 +1,9 @@
"""
Tor Browser Launcher
-https://github.com/micahflee/torbrowser-launcher/
+https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
-Copyright (c) 2013-2021 Micah Lee <micah at micahflee.com>
+Copyright (c) 2013-2023 Micah Lee <micah at micahflee.com>
+Copyright (c) 2024 Tor Project
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -64,14 +65,18 @@ def main():
settings = bool(args.settings)
url_list = args.url
+ # Set the TORBROWSER_LAUNCHER env variable to make it easier to
+ # detect that torbrowser-launcher is being used
+ os.environ["TORBROWSER_LAUNCHER"] = "1"
+
# Load the version and print the banner
with open(os.path.join(SHARE, "version")) as buf:
tor_browser_launcher_version = buf.read().strip()
print(_("Tor Browser Launcher"))
- print(_("By Micah Lee, licensed under MIT"))
+ print(_("By Micah Lee & Tor Project, licensed under MIT"))
print(_("version {0}").format(tor_browser_launcher_version))
- print("https://github.com/micahflee/torbrowser-launcher")
+ print("https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/")
common = Common(tor_browser_launcher_version)
app = Application()
=====================================
torbrowser_launcher/common.py
=====================================
@@ -1,6 +1,6 @@
"""
Tor Browser Launcher
-https://github.com/micahflee/torbrowser-launcher/
+https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
Copyright (c) 2013-2021 Micah Lee <micah at micahflee.com>
@@ -41,15 +41,6 @@ SHARE = os.getenv("TBL_SHARE", sys.prefix + "/share") + "/torbrowser-launcher"
gettext.install("torbrowser-launcher")
-# We're looking for output which:
-#
-# 1. The first portion must be `[GNUPG:] IMPORT_OK`
-# 2. The second must be an integer between [0, 15], inclusive
-# 3. The third must be an uppercased hex-encoded 160-bit fingerprint
-gnupg_import_ok_pattern = re.compile(
- b"(\[GNUPG\:\]) (IMPORT_OK) ([0-9]|[1]?[0-5]) ([A-F0-9]{40})"
-)
-
class Common(object):
def __init__(self, tbl_version):
@@ -104,11 +95,11 @@ class Common(object):
if tbb_version:
# tarball filename
if self.architecture == "x86_64":
- arch = "linux64"
+ arch = "linux-x86_64"
else:
- arch = "linux32"
+ arch = "linux-i686"
- tarball_filename = "tor-browser-" + arch + "-" + tbb_version + "_ALL.tar.xz"
+ tarball_filename = "tor-browser-" + arch + "-" + tbb_version + ".tar.xz"
# tarball
self.paths["tarball_url"] = (
=====================================
torbrowser_launcher/launcher.py
=====================================
@@ -1,8 +1,9 @@
"""
Tor Browser Launcher
-https://github.com/micahflee/torbrowser-launcher/
+https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
-Copyright (c) 2013-2021 Micah Lee <micah at micahflee.com>
+Copyright (c) 2013-2023 Micah Lee <micah at micahflee.com>
+Copyright (c) 2024 Tor Project
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
@@ -72,7 +73,7 @@ class Launcher(QtWidgets.QMainWindow):
self.force_redownload = False
# This is the current version of Tor Browser, which should get updated with every release
- self.min_version = "12.0"
+ self.min_version = "13.0"
# Init launcher
self.set_state(None, "", [])
@@ -407,7 +408,7 @@ class Launcher(QtWidgets.QMainWindow):
"A copy of the Tor Browser files you downloaded have been saved here:\n"
"{1}\n{2}\n\n"
"Click Start to refresh the keyring and try again. If the message persists report the above "
- "error code here:\nhttps://github.com/micahflee/torbrowser-launcher/issues"
+ "error code here:\nhttps://gitlab.torproject.org/tpo/applications/torbrowser-launcher/-/issues/"
)
sigerror = sigerror.format(
message, backup_tarball_filename, backup_sig_filename
=====================================
torbrowser_launcher/settings.py
=====================================
@@ -1,8 +1,9 @@
"""
Tor Browser Launcher
-https://github.com/micahflee/torbrowser-launcher/
+https://gitlab.torproject.org/tpo/applications/torbrowser-launcher/
-Copyright (c) 2013-2021 Micah Lee <micah at micahflee.com>
+Copyright (c) 2013-2023 Micah Lee <micah at micahflee.com>
+Copyright (c) 2024 Tor Project
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/7f077bdc1d1befe3194fde6873969928467a19b6...2e250cf671793cfc14963f72f7ee393e7ef1d740
--
View it on GitLab: https://salsa.debian.org/pkg-privacy-team/torbrowser-launcher/-/compare/7f077bdc1d1befe3194fde6873969928467a19b6...2e250cf671793cfc14963f72f7ee393e7ef1d740
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-privacy-commits/attachments/20240222/65928735/attachment-0001.htm>
More information about the Pkg-privacy-commits
mailing list