tor-commits March 2017

tor-commits@lists.torproject.org

20 participants
1183 discussions

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 10 Mar '17

10 Mar '17

commit d91059dd9bfcce1f826ef82c8fd4591c0162c0dd Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 10 10:48:23 2017 +0000 Update translations for tor-browser-manual --- hr_HR/hr_HR.po | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index ee98dc5..dbd07f1 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -1723,6 +1723,8 @@ msgid "" "When you are prompted to update Tor Browser, click on the Torbutton icon, " "then select “Check for Tor Browser Update”." msgstr "" +"Kad Vas se pita da ažurirate Tor Browser, kliknite na Torbutton ikonu, " +"odaberite \"Provjeri ima li ažuriranja za Tor Browser\"." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1734,12 +1736,16 @@ msgid "" "external ref='media/updating/update3.png' " "md5='4bd08622b0cacf20b13f75c432176ed3'" msgstr "" +"external ref='media/updating/update3.png' " +"md5='4bd08622b0cacf20b13f75c432176ed3'" #: updating.page:41 msgid "" "When Tor Browser has finished checking for updates, click on the “Update” " "button." msgstr "" +"Kad je Tor Browser završio provjeru ažuriranja, kliknite na gumb " +"\"Ažuriraj\"." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1751,22 +1757,28 @@ msgid "" "external ref='media/updating/update4.png' " "md5='1d795e7b695738531db9d4b2b0fb5313'" msgstr "" +"external ref='media/updating/update4.png' " +"md5='1d795e7b695738531db9d4b2b0fb5313'" #: updating.page:50 msgid "" "Wait for the update to download and install, then restart Tor Browser. You " "will now be running the latest version." msgstr "" +"Pričekajte da se ažuriranje preuzme i instalira, zatim ponovno pokrenite Tor" +" Browser. Sad imate najnoviju verziju." #: updating.page:58 msgid "Updating Tor Browser manually" -msgstr "" +msgstr "Ručno ažuriranje Tor Browsera" #: updating.page:61 msgid "" "When you are prompted to update Tor Browser, finish the browsing session and" " close the program." msgstr "" +"Kad Vas se pita za ažuriranje Tor Browsera, završite pregledavanje i " +"zatvorite program." #: updating.page:67 msgid "" @@ -1774,6 +1786,9 @@ msgid "" "(see the <link xref=\"uninstalling\">Uninstalling</link> section for more " "information)." msgstr "" +"Uklonite Tor Browser iz svog sustava brisanjem direktorija u kojem se nalazi" +" (vidjeti dio o <link xref=\"uninstalling\">Deinstaliranju</link> za više " +"informacija)." #: updating.page:74 msgid "" @@ -1781,3 +1796,7 @@ msgid "" " https://www.torproject.org/projects/torbrowser.html.en</link> and download " "a copy of the latest Tor Browser release, then install it as before." msgstr "" +"Posjetite <link " +"href=\"https://www.torproject.org/projects/torbrowser.html.en\"> " +"https://www.torproject.org/projects/torbrowser.html.en</link> i preuzmite " +"kopiju najnovijeg Tor Browsera, te ga instalirajte kao i prije."

1 0

[tor-browser-build/master] Update firefox, http-e, openssl, tor, torbutton versions
by boklm＠torproject.org 10 Mar '17

10 Mar '17

commit e040f4434ea48ad7be41d2a22f19dc58a3ac8f5b Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Mar 10 11:44:33 2017 +0100 Update firefox, http-e, openssl, tor, torbutton versions --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/https-everywhere/config | 2 +- projects/openssl/config | 10 ++-------- projects/tor/config | 2 +- projects/torbutton/config | 2 +- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index a645b92..dd96dcd 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build1 + ff_build: build2 ff_arch: linux-i686 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' diff --git a/projects/firefox/config b/projects/firefox/config index 96be619..f7e89e5 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ gpg_keyring: torbutton.gpg remote_docker: 1 var: - firefox_version: 45.7.0esr + firefox_version: 45.8.0esr torbrowser_branch: 7.0 torbrowser_update_channel: alpha copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 557473d..17f9f82 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 5.2.9 +version: 5.2.11 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/openssl/config b/projects/openssl/config index 637f3d1..8490b0b 100644 --- a/projects/openssl/config +++ b/projects/openssl/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.0.2j +version: 1.0.2k filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' remote_docker: 1 @@ -24,15 +24,9 @@ targets: pre_pkginst: dpkg --add-architecture i386 compiler: macosx-toolchain-gcc - nightly: - version: 1.0.2k - input_files: - project: docker-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' - sha256sum: e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431 - targets: - nightly: - sha256sum: 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 + sha256sum: 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 diff --git a/projects/tor/config b/projects/tor/config index 2fbbf24..55637dc 100644 --- a/projects/tor/config +++ b/projects/tor/config @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -version: 0.3.0.2-alpha +version: 0.3.0.4-rc git_hash: 'tor-[% c("version") %]' git_url: https://git.torproject.org/tor.git gpg_keyring: tor.gpg diff --git a/projects/torbutton/config b/projects/torbutton/config index 5ff51f8..fdc9208 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 1.9.7 +version: 1.9.7.1 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 10 Mar '17

10 Mar '17

commit 3c6d19bafc575199462a13f8ddd23dd0cb809765 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 10 10:20:06 2017 +0000 Update translations for tor-browser-manual --- hr_HR/hr_HR.po | 75 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index d70107a..ee98dc5 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -1502,17 +1502,19 @@ msgstr "ScrambleSuit je sličan obfs4 ali ima drugačiji set mostova." #: transports.page:69 msgid "FTE" -msgstr "" +msgstr "FTE" #: transports.page:74 msgid "" "FTE (format-transforming encryption) disguises Tor traffic as ordinary web " "(HTTP) traffic." msgstr "" +"FTE (format-transforming encryption) krije Torov promet kao uobičajeni " +"(HTTP) promet." #: transports.page:82 msgid "meek" -msgstr "" +msgstr "meek" #: transports.page:87 msgid "" @@ -1521,10 +1523,15 @@ msgid "" "Web Services; meek-azure makes it look like you are using a Microsoft web " "site; and meek-google makes it look like you are using Google search." msgstr "" +"Svi ovi trnasporti prikazuju Vaš promet tako da izgleda kao gledate neku " +"veliku stranicu, umjesto da koristite Tor. meek-amazon se prikazuje kao da " +"koristite Amazon Web usluge; meek-azure se prikazuje kao da koristite " +"Microsoftovu stranicu; meek-google se prikazuje kao da koristite Googleovu " +"tražilicu." #: troubleshooting.page:6 msgid "What to do if Tor Browser doesn’t work" -msgstr "" +msgstr "Što učiniti ako Tor Browser ne radi" #: troubleshooting.page:12 msgid "" @@ -1532,28 +1539,36 @@ msgid "" " running the program, and clicking the “Connect” button if you are using it " "for the first time." msgstr "" +"Trebali bi imati pristup mreži nedugo nakon što pokrenete Tor Browser, i " +"kliknete gumb \"Spoji se\", ako ga koristite prvi put." #: troubleshooting.page:21 msgid "Quick fixes" -msgstr "" +msgstr "Brzi popravci" #: troubleshooting.page:22 msgid "" "If Tor Browser doesn’t connect, there may be a simple solution. Try each of " "the following:" msgstr "" +"Ako se Tor Browser ne spoji, možda postoji jednostavno rješenje. Probajte " +"sve od navedenog:" #: troubleshooting.page:29 msgid "" "Your computer’s system clock must be set correctly, or Tor will not be able " "to connect." msgstr "" +"Sat Vašeg operativnog sustava na računalu mora biti točan inače se Tor ne " +"može spojiti." #: troubleshooting.page:35 msgid "" "Make sure another Tor Browser is not already running. If you’re not sure if " "Tor Browser is running, restart your computer." msgstr "" +"Osigurajte da je samo jedan Tor Browser pokrenut. Ako niste sigurni je li " +"Tor Browser već pokrenut, ponovno pokrenite računalo." #: troubleshooting.page:41 msgid "" @@ -1561,20 +1576,26 @@ msgid "" "Tor from running. You may need to consult the documentation for your " "antivirus software if you do not know how to do this." msgstr "" +"Osigurajte da svi instalirani antivirusni programi ne sprječavaju pokretanje" +" Tora. Možda ćete se morati posavjetovati s dokumentacijom svog antivirusnog" +" softwarea ako ne znate kako to napraviti." #: troubleshooting.page:49 msgid "Temporarily disable your firewall." -msgstr "" +msgstr "Privremeno onemogućite svoj vatrozid." #: troubleshooting.page:54 msgid "" "Delete Tor Browser and install it again. If updating, do not just overwrite " "your previous Tor Browser files; ensure they are fully deleted beforehand." msgstr "" +"Obrišite Tor Browser i instalirajte ga ponovno. Ako ažurirate, nemojte samo " +"prepisati stare datoteke Tor Browsera; osigurajte se da su u potpunosti " +"obrisane." #: troubleshooting.page:64 msgid "Is your connection censored?" -msgstr "" +msgstr "Je li Vaša veza cenzurirana?" #: troubleshooting.page:65 msgid "" @@ -1582,10 +1603,13 @@ msgid "" "censoring connections to the Tor network. Read the <link " "xref=\"circumvention\">Circumvention</link> section for possible solutions." msgstr "" +"Ako se i dalje ne možete spojiti, postoji mogućnost da Vaš davatelj internet" +" usluge cenzurira veze na Tor mrežu. Pročitajte dio o <link " +"xref=\"circumvention\">Obilaženju</link> kako bi našli moguća rješenja." #: troubleshooting.page:74 msgid "Known issues" -msgstr "" +msgstr "Poznati problemi" #: troubleshooting.page:75 msgid "" @@ -1594,14 +1618,17 @@ msgid "" "Issues</link> page to see if the problem you are experiencing is already " "listed there." msgstr "" +"Tor Browser se stalno razvija, i neki problemi su nam poznati, ali nisu još " +"riješeni. Provjerite stranicu o <link xref=\"known-issues\">Poznatim " +"problemima</link> da vidite ako je problem kojeg imate tamo prikazan." #: uninstalling.page:6 msgid "How to remove Tor Browser from your system" -msgstr "" +msgstr "Kako ukloniti Tor Browser iz Vašeg sustava" #: uninstalling.page:10 msgid "Uninstalling" -msgstr "" +msgstr "Deinstaliranje" #: uninstalling.page:12 msgid "" @@ -1609,10 +1636,13 @@ msgid "" " computer. Uninstalling Tor Browser will not affect your system’s software " "or settings." msgstr "" +"Tor Browser ne utječe na ikoji od postojećeg softwarea ili postavki Vašeg " +"računala. Uklanjanje Tor Browsera neće utjecati na software ili postavke " +"Vašeg računala." #: uninstalling.page:18 msgid "Removing Tor Browser from your system is simple:" -msgstr "" +msgstr "Uklanjanje Tor Browsera iz Vašeg sustava je jednostavno:" #: uninstalling.page:24 msgid "" @@ -1621,27 +1651,33 @@ msgid "" "default location, however the folder will be named \"tor-browser_en-US\" if " "you are running the English Tor Browser." msgstr "" +"Pronađite direktorij Tor Browsera. Zadana lokacija na Windowsima je " +"Desktop/Radna površina; na Mac OS X je direktorij Aplikacije. Na Linuxu " +"nema zadane lokacije, direktorij će biti nazvan \"tor-browser_en-US\" ako " +"imate englesku verziju Tor Browsera." #: uninstalling.page:32 msgid "Delete the Tor Browser folder." -msgstr "" +msgstr "Obrišite Tor Browser direktorij." #: uninstalling.page:35 msgid "Empty your Trash" -msgstr "" +msgstr "Ispraznite koš za smeće" #: uninstalling.page:39 msgid "" "Note that your operating system’s standard “Uninstall” utility is not used." msgstr "" +"Napominjemo da se mogućnost \"Deinstaliraj\" unutar Vašeg operativnog " +"sustava ne koristi." #: updating.page:6 msgid "How to update Tor Browser" -msgstr "" +msgstr "Kako ažurirati Tor Browser" #: updating.page:10 msgid "Updating" -msgstr "" +msgstr "Ažuriranje" #: updating.page:12 msgid "" @@ -1649,6 +1685,9 @@ msgid "" "outdated version of the software, you may be vulnerable to serious security " "flaws that compromise your privacy and anonymity." msgstr "" +"Tor Browser mora biti ažuriran stalno. Ako nastavite koristiti neažuriranu " +"verziju softwarea, možete postati ranjivi na ozbiljne sifgurnosne greške " +"koje kompromitiraju Vašu privatnost i anonimnost." #: updating.page:18 msgid "" @@ -1657,10 +1696,14 @@ msgid "" "may see a written update indicator when Tor Browser opens. You can update " "either automatically or manually." msgstr "" +"Tor Browser će Vas pitati želite li ažurirati software svaki put kad izađe " +"nova verzija: ikona Torbuttona će prikazati žuti trokut i možda ćete vidjeti" +" pisani indikator ažuriranja kad se Tor Browser otvori. Možete ažurirati " +"automatski ili ručno." #: updating.page:26 msgid "Updating Tor Browser automatically" -msgstr "" +msgstr "Automatsko ažuriranje Tor Browsera " #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -1672,6 +1715,8 @@ msgid "" "external ref='media/updating/update1.png' " "md5='9ff01eb653d92124746fc31efde2bf07'" msgstr "" +"external ref='media/updating/update1.png' " +"md5='9ff01eb653d92124746fc31efde2bf07'" #: updating.page:32 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 10 Mar '17

10 Mar '17

commit 6fbbbe26eb02a551371c8d8363bc51d20a14c810 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 10 09:48:21 2017 +0000 Update translations for tor-browser-manual --- hr_HR/hr_HR.po | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po index 9a49c1f..d70107a 100644 --- a/hr_HR/hr_HR.po +++ b/hr_HR/hr_HR.po @@ -1488,14 +1488,17 @@ msgid "" "from finding bridges by Internet scanning. obfs4 bridges are less likely to " "be blocked than obfs3 bridges." msgstr "" +"obfs4 prikazuje Torov promet kao nasumičan, jednako kao i obfs3, uz dodatak " +"da sprječava cenzore od pronalaženja mostova. obfs4 mostovi imaju manje " +"šanse da će biti blokirani." #: transports.page:56 msgid "Scramblesuit" -msgstr "" +msgstr "Scramblesuit" #: transports.page:61 msgid "ScrambleSuit is similar to obfs4 but has a different set of bridges." -msgstr "" +msgstr "ScrambleSuit je sličan obfs4 ali ima drugačiji set mostova." #: transports.page:69 msgid "FTE"

1 0

[tor-messenger-build/master] Document installing deps on Fedora
by arlo＠torproject.org 10 Mar '17

10 Mar '17

commit 8cdd59bdff90926d5677c79dfc813e1784b0f5e2 Author: Vu Quoc Huy <huyvq.c633(a)gmail.com> Date: Thu Mar 9 20:21:32 2017 -0800 Document installing deps on Fedora --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index a45ef70..53ad767 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,17 @@ If you are running Debian or Ubuntu, you can install them with: git mercurial ``` +If you are running Fedora (24 or later), you can install them with: + +``` +# dnf install 'perl(YAML::XS)' 'perl(File::Basename)' 'perl(Getopt::Long)' \ + 'perl(Template)' 'perl(IO::Handle)' 'perl(IO::CaptureOutput)' \ + 'perl(File::Temp)' 'perl(File::Slurp)' 'perl(File::Path)' \ + 'perl(String::ShellQuote)' 'perl(Sort::Versions)' \ + 'perl(Digest::SHA)' 'perl(Data::UUID)' 'perl(Data::Dump)' \ + git mercurial +``` + Starting a build ----------------

1 0

[torflow/master] Turn off Guards
by tom＠torproject.org 09 Mar '17

09 Mar '17

commit c3f584bf53fcde8666c3dceb071372b36ef07dcb Author: Tom Ritter <tom(a)ritter.vg> Date: Thu Mar 9 16:16:19 2017 -0600 Turn off Guards When running the bandwidth scanner with recent tor versions, the pathbias detector complains about circuit state at notice level. This could quickly fill the logs. --- NetworkScanners/BwAuthority/data/tor.1/torrc | 3 +++ NetworkScanners/BwAuthority/data/tor.2/torrc | 3 +++ 2 files changed, 6 insertions(+) diff --git a/NetworkScanners/BwAuthority/data/tor.1/torrc b/NetworkScanners/BwAuthority/data/tor.1/torrc index 933141e..95f8bd4 100644 --- a/NetworkScanners/BwAuthority/data/tor.1/torrc +++ b/NetworkScanners/BwAuthority/data/tor.1/torrc @@ -16,3 +16,6 @@ FetchDirInfoEarly 1 # Use CREATE cells for first hop, so we can still measure CPU overload via # circ failure FastFirstHopPK 0 + +# Turn pathbias off, so it doesn't flood the logs +UseEntryGuards 0 diff --git a/NetworkScanners/BwAuthority/data/tor.2/torrc b/NetworkScanners/BwAuthority/data/tor.2/torrc index 209781f..0232163 100755 --- a/NetworkScanners/BwAuthority/data/tor.2/torrc +++ b/NetworkScanners/BwAuthority/data/tor.2/torrc @@ -16,3 +16,6 @@ FetchDirInfoEarly 1 # Use CREATE cells for first hop, so we can still measure CPU overload via # circ failure FastFirstHopPK 0 + +# Turn pathbias off, so it doesn't flood the logs +UseEntryGuards 0

1 0

[torflow/master] Remove a URL that no longer works
by tom＠torproject.org 09 Mar '17

09 Mar '17

commit d36424497438cfce7a5af79a9a3affe79f3cba40 Author: teor <teor2345(a)gmail.com> Date: Mon Oct 31 17:21:08 2016 +1100 Remove a URL that no longer works Signed-off-by: teor <teor2345(a)gmail.com> --- NetworkScanners/BwAuthority/bwauthority_child.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index a36728f..3ae484d 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -49,7 +49,8 @@ user_agent = "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.37 # Note these urls should be https due to caching considerations. # If you really must make them http, be sure to change exit_ports to [80] # below, or else the scan will not finish. -urls = ["https://38.229.70.2/", "https://38.229.72.16/bwauth.torproject.org/"] +# Doesn't work: "https://38.229.70.2/" +urls = ["https://38.229.72.16/bwauth.torproject.org/"] # Do NOT modify this object directly after it is handed to PathBuilder

1 0

[torspec/master] prop224: Fix typo in Appendix A
by dgoulet＠torproject.org 09 Mar '17

09 Mar '17

commit 86382b8a36433ed0a4e8c7da6ebe993ffe2e48be Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Mar 9 14:50:04 2017 -0500 prop224: Fix typo in Appendix A Reported-by: isis <isis(a)torproject.org> Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- proposals/224-rend-spec-ng.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index dc33bb8..ae990d4 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -1993,7 +1993,7 @@ Appendix A. Signature scheme with key blinding [KEYBLIND] Without knowing pk, it is not possible to derive pk_n; without knowing sk, it is not possible to derive sk_n. - It's possible to check that a signature make with sk_n while + It's possible to check that a signature was made with sk_n while knowing only pk_n. Someone who sees a large number of blinded public keys and

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 09 Mar '17

09 Mar '17

commit 942597e609b8df3de4906f15585190af1e17a940 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Mar 9 19:18:22 2017 +0000 Update translations for tor-browser-manual --- de/de.po | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/de/de.po b/de/de.po index 522d615..f055cfd 100644 --- a/de/de.po +++ b/de/de.po @@ -7,6 +7,7 @@ # D P <m(a)slugline.de>, 2016 # gregweb <gregweb(a)web.de>, 2016 # runasand <inactive+runasand(a)transifex.com>, 2016 +# Axel Laemmert <wildvirus(a)gmx.net>, 2016 # Inter Webs <hallohallo11(a)web.de>, 2016 # Christian Humm <christian.lehberger(a)googlemail.com>, 2017 # kan torkel <kantorkel(a)hamburg.freifunk.net>, 2017 @@ -44,9 +45,8 @@ msgid "" "Tor Browser uses the Tor network to protect your privacy and anonymity. " "Using the Tor network has two main properties:" msgstr "" -"Der Tor-Browser benutzt das Tor Netzwerk um deine Privatsfähre und deine " -"Anonymität zu schützen. Das Tor Netzwerk zu benutzen hat zwei " -"Haupteigenschaften:" +"Der Tor-Browser benutzt das Tor Netzwerk um deine Privatsphähre und deine " +"Anonymität zu schützen. Das Tor Netzwerk zu benutzen hat zwei Vorteile:" #: about-tor-browser.page:18 msgid "" @@ -85,10 +85,10 @@ msgid "" " valid for a single session (until Tor Browser is exited or a <link xref" "=\"managing-identities#new-identity\">New Identity</link> is requested)." msgstr "" -"Normalerweise, behält der Tor Browser keinen Verlauf. Cookies sin nur für " +"Normalerweise behält der Tor Browser keinen Verlauf. Cookies sind nur für " "eine einzige Sitzung gültig (bis der Tor Browser geschlossen wird oder eine" " <link xref=\"managing-identities#new-identity\">neue Identität</link> " -"angefragt wird)." +"gestartet wird)." #: about-tor-browser.page:50 msgid "How Tor works" @@ -102,9 +102,9 @@ msgid "" " last relay in the circuit (the “exit relay”) then sends the traffic out " "onto the public Internet." msgstr "" -"Tor ist ein Netzwerk aus virtuellen Tunneln, die es Ihnen erlauben, Ihre " +"Tor ist ein Netzwerk aus virtuellen Tunneln, die es Dir erlauben, Deine " "Privatsphäre und Sicherheit im Internet zu verbessern. Tor funktioniert, " -"indem es Ihren Verkehr über drei zufällige Server (auch bekannt als " +"indem es Deinen Verkehr über drei zufällige Server (auch bekannt als " "<em>Relais</em>) im Tor-Netzwerk sendet. Das letzte Relais im Kanal (das " "\"Ausgangsrelais\") sendet dann den Verkehr in das öffentliche Internet." @@ -167,7 +167,7 @@ msgid "" "yourself. You have two options:" msgstr "" "Weil die Adressen der Brücken nicht öffentlich sind, musst du sie selber " -"anfragen. Du hast zwei möglichkeiten:" +"anfragen. Du hast zwei Möglichkeiten:" #: bridges.page:36 msgid "" @@ -184,8 +184,8 @@ msgid "" "Email bridges(a)torproject.org from a Gmail, Yahoo, or Riseup email address, " "or" msgstr "" -"Schreiben Sie eine E-Mail an bridges(a)torproject.org von einer Gmail-, " -"Yahoo- oder Riseup-E-Mail-Adresse oder" +"Schreibe eine E-Mail an bridges(a)torproject.org von einer Gmail-, Yahoo- " +"oder Riseup-E-Mail-Adresse oder" #: bridges.page:51 msgid "Entering bridge addresses" @@ -205,10 +205,10 @@ msgid "" " to the Tor network. Select “Use custom bridges” and enter each bridge " "address on a separate line." msgstr "" -"Wählen Sie \"ja\" aus, wenn Sie danach gefragt werden, ob Ihr " -"Internetdienstanbieter Verbindungen zum Tor-Netzwerk blockiert. Wählen Sie " -"\"benutzerdefinierte Brücken nutzen\" und fügen Sie jede Brückenadresse in " -"einer eigenen Zeile ein." +"Wähle \"ja\" aus, wenn Du danach gefragt werden, ob Dein " +"Internetdienstanbieter Verbindungen zum Tor-Netzwerk blockiert. Wähle " +"\"benutzerdefinierte Brücken nutzen\" und füge jede Brückenadresse in einer " +"eigenen Zeile ein." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -230,12 +230,11 @@ msgid "" " may be down. Please use one of the above methods to obtain more bridge " "addresses, and try again." msgstr "" -"Klicken Sie auf \"Verbinden\". Das Benutzen von Brücken kann Ihre " -"Internetverbindung, im Vergleich zur Verwendung normaler Tor-Relais, " +"Klicke auf \"Verbinden\". Das Benutzen von Brücken kann Deine " +"Internetverbindung -im Vergleich zur Verwendung normaler Tor-Relais- " "verlangsamen. Wenn die Verbindung fehlschlägt, kann es daran liegen, dass " -"die Brücken nicht mehr aktiv sind. Bitte verwenden Sie eine der obigen " -"Methoden, um mehr Brückenadressen zu erhalten und versuchen Sie es noch " -"einmal." +"die Brücken nicht mehr aktiv sind. Bitte verwende eine der oben genannten " +"Methoden, um mehr Brückenadressen zu erhalten und versuche es noch einmal." #: circumvention.page:6 msgid "What to do if the Tor network is blocked" @@ -385,6 +384,9 @@ msgid "" "simply write “windows”, “osx”, or “linux”, (without quotation marks) " "depending on your operating system." msgstr "" +"Sende eine E-Mail an gettor(a)torproject.org und gib in der Mail als Nachricht" +" nur \"windows\", \"osx\" oder \"linux\" (jeweils ohne Klammern) in " +"Abhängigkeit von Deinem Betriebssystem ein." #: downloading.page:46 msgid ""

1 0

[tor-messenger-build/master] Start documenting some of the rebase procedure
by arlo＠torproject.org 09 Mar '17

09 Mar '17

commit 2f3b77d2e397b9b839ac9d414c5bd4fa943281b1 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Mar 9 08:37:04 2017 -0800 Start documenting some of the rebase procedure --- README | 77 --------------- README.RELEASE | 274 ----------------------------------------------------- README.md | 81 ++++++++++++++++ docs/rebasing.md | 102 ++++++++++++++++++++ docs/release.md | 284 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 467 insertions(+), 351 deletions(-) diff --git a/README b/README deleted file mode 100644 index 7af597b..0000000 --- a/README +++ /dev/null @@ -1,77 +0,0 @@ -Tor Messenger Build -=================== - -Installing build dependencies ------------------------------ - -To build Tor Messenger, you need a Linux distribution that has support -for Docker (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). -The Docker package is usually named docker.io or docker-io. -On Debian jessie, the docker.io package is available in backports. - -Your user account should have access to the docker command without using -sudo, so it should be in the docker group. The docker daemon should -also be running. - -The sources are downloaded using git and mercurial which need to be -installed. - -You also need a few perl modules installed: -- YAML::XS -- File::Basename -- Getopt::Long -- Template -- IO::Handle -- IO::CaptureOutput -- File::Temp -- File::Slurp -- File::Path -- String::ShellQuote -- Sort::Versions -- Digest::SHA -- Data::UUID -- Data::Dump - -If you are running Debian or Ubuntu, you can install them with: - -# apt-get install libyaml-libyaml-perl libtemplate-perl \ - libio-handle-util-perl libio-all-perl \ - libio-captureoutput-perl libfile-slurp-perl \ - libstring-shellquote-perl libsort-versions-perl \ - libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ - git mercurial - - -Starting a build ----------------- - -To start a build, simply run "make all" in the directory to build all -currently supported architectures. - -If you want to build only one architecture, you can run something like -"make tor-messenger-linux-x86_64". - -The resulting builds are stored in the out/tor-messenger directory. - -You can also run "make tor-messenger-release" to build it for all -architectures, rename files to their final name and generate an -sha256sums.txt file in the directory release/$version. - - -Updating git and hg sources ---------------------------- - -You can run "make fetch" to fetch the latest sources from git and -mercurial for all components included in Tor Messenger. - - -Cleaning obsolete files and containers images ---------------------------------------------- - -To clean obsolete files and containers images, you can run "make clean-old". - -This command will remove any intermediate build files and containers -that are no longer used in the current builds. Because it needs to -compute the filename of all current files, this command takes a lot of -time to run. - diff --git a/README.RELEASE b/README.RELEASE deleted file mode 100644 index 1170207..0000000 --- a/README.RELEASE +++ /dev/null @@ -1,274 +0,0 @@ -Release Process for Tor Messenger -================================= - -You are ready to release Tor Messenger when you have performed a substantial -development effort, or you have to patch a security issue. - -The release process is divided into two parts: building Tor Messenger, and -then signing the MAR files for secure automatic updates; follow this guide -step by step to complete both the steps. - -Building -======== - -- If not already done, bump the version number in `ChangeLog', `rbm.conf', - `tools/update-responses/config.yml' - -- Ensure `HEAD' on the build machines matches the `master' of - `tor-messenger-build.git' repository. - -- Run `make fetch' before the next step. - -- Run `make tor-messenger-release'. The builds will be in the - `release/$VERSION' directory, along with the MAR files. This will also - output the `sha256sum' of the files. - -- Compare the Linux builds with at least one other person -- preferably - building on another machine -- to check if they are reproducible. - -- Test the builds on all platforms: - - - Create an XMPP account and IRC account - - - Ensure that the corresponding OTR keys have been generated (Tools > - OTR Preferences > Private Keys) - - - Initiate an OTR conversation with another instance. Verify the - various authentication mechanisms. - -- If everything is fine, send the Windows and macOS builds (EXE and DMG) to - the Tor Browser team for code signing. - -! Wait to get the signed EXE and DMG back before proceeding to the next step ! - -Making Update MARs -================== - -This step only works if you want to do an update build and have a base version -to diff against. So if you are upgrading from A to B, follow these steps; this -assumes that A is the older version and B is the newer one. - - ! These steps are not required if you are doing a build for just A or B ! - -- Navigate to the build directory on the build machine - -- `cd tor-messenger-build/release/ && mkdir -p tor-messenger/signed/$VERSION' - (where $VERSION is the version of the release, same as in rbm.conf). - -- You are now in the tor-messenger/signed/$VERSION/ directory - -- Copy all the release files from tor-messenger-release into this directory - - cp -r ../../../$VERSION/* . - - ! If this is the first time you are doing an update, make sure the older - version is also present in the signed/ directory. For example if you are - building B for the first time, you should have A/ in the signed/ directory. - Repeat the above steps for A (if not already done): - mkdir -p tor-messenger/signed/A - cd A/ - cp -r ../../../A/* . - The `gen_incrementals' script will complain about this. - -- Now copy the SIGNED Windows and macOS EXE and DMG files which the Tor - Browser team has uploaded. - - Check this step again to ensure you have the signed binaries. Compare - the checksums! - -- At this stage, you have the code signed binaries and the unsigned complete - MARs. - -- Now go to `tor-messenger-build/tools/update-responses'. - -- Edit `config.yml': - - Check and update the version in the `channel' section - - In `version', add a new section (see existing sections for help) - corresponding to the release version - - Assume you are updating from A to B. Your `config.yml' should look like: - - channels: - release: B - B: - platformVersion: 45.6.0 - detailsURL: https://blog.torproject.org/blog/tor-messenger-B-released - incremental_from: - - A - - ! Increment platformVersion if it has changed - ! Update detailsURL which will point to the blog post detailing the release - -- Now run `./gen_incrementals'. In the `signed/$VERSION' directory, you should - see incremental MARs from A->B along with the existing complete MARs. - -- This completes the MAR generation step. The next step is signing, which - takes place offline. - -Signing Update MARs -=================== - -This step has to be performed offline and assumes you have the MAR signing -certificates and the private keys. - - ! DO NOT copy the certificate directory to ANY remote machine ! - -! This step works only on a Linux machine (32-bit or 64-bit) - -# Offline Steps Start # - -- Create a new local directory - -- Copy `signmars.py' from the build repository (`tor-messenger/tools/update-responses/') - -- Copy the following files from the signed/ directory in the previous section - to the current local directory: - - mar-tools-linux*.zip - *.mar - - scp tor-messenger-build/release/tor-messenger/signed/$VERSION/{*.mar,mar-tools-linux*.zip} . - -- Set `NSS_DB_DIR' to point to the directory with the certificate files. You - should point to the directory with the `cert8.db' file. - -- Run `signmars.py' and follow the steps. The signed MARs will be in the - signed/ directory. - -- cd signed/ - -- Upload the signed MARs back to the directory you copied them from. - - scp *.mar tor-messenger-build/release/tor-messenger/signed/$VERSION/ - -# Offline Steps End # - -- Back to the build machine: navigate to tools/update-responses/. Run - `./update_responses' to generate the update manifest. - -- Generate the checksums for the builds: - - sha256sum `ls -I "*.zip" -I "*.txt"` > sha256sums-signed-build.txt - -- GPG sign the sha256sums-signed-build.txt file: - - - Copy the sha256sums-signed-build.txt to a local machine - - gpg -abs sha256sums-signed-build.txt - - - Upload the signature (*.asc) back to build machine signed/ directory. - -- At this stage, you have the code signed DMG and EXE, Linux builds, signed - MAR files, the update information, and the signed sha256sum of all files. - -Testing Updates -=============== - -Before we push the update to users, we should test them first to make sure -that incremental (or complete updates) are working as intended. We do this by -pushing the updates to the `update_2.test' directory instead of `update_2'. - -- Copy the `htdocs/release' directory from the last section to `aus2.torproject.org' - staticiforme.torproject.org:/srv/aus2-master.torproject.org/htdocs/tormesse… - - ! Make sure the .htaccess file is copied as well. - -- ssh to `staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/tormessenger' - `mkdir $VERSION` to create the directory for the new version. - -- Copy the contents* of the signed/ directory (MAR files) to dist.tormessenger.org/tormessenger/$VERSION - staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/tormesse… - - * - You can skip sha256sums-unsigned-build.txt since we don't use it. - -- ssh to `staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/tormessenger' - - Run `ln -sfn $VERSION current' - This helps us ensure that the `current' directory always refers to the - latest release of Tor Messenger - - Exit - -- We need to finalize the changes. Run: - ssh staticiforme.torproject.org static-update-component dist.torproject.org && ssh staticiforme.torproject.org static-update-component aus2.torproject.org - -- Now test the updates on ALL platforms as it is possbile that updates may - work on one but fail on the other. - - - Start Tor Messenger - - - Open the preferences editor and copy the value for preference `app.update.url' - - - Create a new string preference (Right click -> New -> String) and set - the name to `app.update.url.override'. Set the value copied from the - previous step REPLACING `update_2' with `update_2.test'. Your string - should be: - - https://aus2.torproject.org/tormessenger/update_2.test/%CHANNEL%/%BUILD_TAR… - - - Create a new boolean preference `app.update.log' and set it to `true' - - - Force an update by going to the about screen - - - Tor Messenger should update (incrementally) and then restart - - - The update should be applied on restart. If not, it should complain and - that means something is broken. Since we set `app.update.log' to `true', - it's a good time to look at the error console - -If everything went on fine with the testing, move on to the next step. - -Finalizing Updates and Releasing -================================ - -- Publish the blog post on blog.torproject.org. The URL should follow the same - format as described in the `config.yml' file for $VERSION - -- ssh to `staticiforme.torproject.org:/srv/aus2-master.torproject.org/htdocs/tormessenger/update_2/release` - -- Delete the existing files and then copy the changes from the `test' directory: - - cp -R ../../update_2.test/release/. . - -- The update is still not live. To finalize it, exit, and then run: - - ssh staticiforme.torproject.org static-update-component aus2.torproject.org - -- The update is now live. Now is a good time to again test if the updates are - being properly pushed to the users! It may be a good idea to repeat the Tor - Messenger tests in the previous section. (Install older version, force - update, check.) - -- Finalize the release process by tagging the version in - `tor-messenger-build.git' (run the code below). Make sure that HEAD is the - commit which adds the release date to the ChangeLog. - - VERSION=`awk '/tormessenger_version/ {print $2}' rbm.conf | cut -d "'" -f2` - git tag -s v$VERSION -m "version $VERSION" - git push --tags - -- This completes the release process. - -After a Release -=============== - -- Bump up the version number in ChangeLog, rbm.conf, - tools/update-responses/config.yml for the next release - -- Increment the version number and update the links on - https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger - -- Administer the comments on the blog and reply to them. Open relevant tickets - wherever necessary. - -Troubleshooting -=============== - -- If you want to update add-ons like ctypes-otr or tor-launcher, make sure to - bump the version number in their `install.rdf' file. Add-ons are only - updated if the version number is incremented. - -- Any changes you make on staticiforme.torproject.org have to be finalized - with the `static-update-component $DIR' command. So if you have made changes - to `dist.torproject.org', you have to run: - - ssh staticiforme.torproject.org static-update-component dist.torproject.org - -- Make sure `app.update.log' is set to `true' before testing updates since you - will get logging information as the update is applied, and if it fails. diff --git a/README.md b/README.md new file mode 100644 index 0000000..a45ef70 --- /dev/null +++ b/README.md @@ -0,0 +1,81 @@ +Tor Messenger Build +=================== + +Installing build dependencies +----------------------------- + +To build Tor Messenger, you need a Linux distribution that has support +for Docker (such as Debian jessie, Ubuntu 14.04, Fedora 20, etc ...). +The Docker package is usually named docker.io or docker-io. +On Debian jessie, the docker.io package is available in backports. + +Your user account should have access to the docker command without using +sudo, so it should be in the docker group. The docker daemon should +also be running. + +The sources are downloaded using git and mercurial which need to be +installed. + +You also need a few perl modules installed: + +``` +- YAML::XS +- File::Basename +- Getopt::Long +- Template +- IO::Handle +- IO::CaptureOutput +- File::Temp +- File::Slurp +- File::Path +- String::ShellQuote +- Sort::Versions +- Digest::SHA +- Data::UUID +- Data::Dump +``` + +If you are running Debian or Ubuntu, you can install them with: + +``` +# apt-get install libyaml-libyaml-perl libtemplate-perl \ + libio-handle-util-perl libio-all-perl \ + libio-captureoutput-perl libfile-slurp-perl \ + libstring-shellquote-perl libsort-versions-perl \ + libdigest-sha-perl libdata-uuid-perl libdata-dump-perl \ + git mercurial +``` + +Starting a build +---------------- + +To start a build, simply run `make all` in the directory to build all +currently supported architectures. + +If you want to build only one architecture, you can run something like +`make tor-messenger-linux-x86_64`. + +The resulting builds are stored in the out/tor-messenger directory. + +You can also run `make tor-messenger-release` to build it for all +architectures, rename files to their final name and generate an +sha256sums.txt file in the directory release/$version. + + +Updating git and hg sources +--------------------------- + +You can run `make fetch` to fetch the latest sources from git and +mercurial for all components included in Tor Messenger. + + +Cleaning obsolete files and containers images +--------------------------------------------- + +To clean obsolete files and containers images, you can run `make clean-old`. + +This command will remove any intermediate build files and containers +that are no longer used in the current builds. Because it needs to +compute the filename of all current files, this command takes a lot of +time to run. + diff --git a/docs/rebasing.md b/docs/rebasing.md new file mode 100644 index 0000000..98101f2 --- /dev/null +++ b/docs/rebasing.md @@ -0,0 +1,102 @@ +Rebasing +======== + +When a new version of Tor Browser or Thunderbird is tagged, we need to +rebase our patchsets. This doc will help the unacquainted. + +Maintaining a fork +------------------ + +This might be another approach. We're kind of waiting on, +https://bugzilla.mozilla.org/show_bug.cgi?id=1309045 + +so we can sync that here, +https://gitweb.torproject.org/tor-messenger.git/ + +Sync'ing mercurial to git +------------------------- + +This isn't strictly necessary but the author of this document prefers working +in git. You'll need to install [fast-export](https://github.com/frej/fast-export) + +``` +hg clone https://hg.mozilla.org/releases/comm-esr45/ +mkdir tor-messenger +cd tor-messenger +git init +hg-fast-export -r ../comm-esr45 +``` + +Note, this is going to complain about detached heads in mercurial. +Just `--force` it. + +Now you have a git repo sync'd w/ hg + +You can rerun that as new commits come in (`hg pull && hg update`), +but ignore that for now. + +Applying the Tor Messenger patches to a tag +------------------------------------------- + +Let's checkout the right Thunderbird tag in git. The specific tag below is +from the time this document was originally written. Obviously, update it as +necessary. + +``` +export TAG=THUNDERBIRD_45_8_0_RELEASE + +# We're still in "tor-messenger" from above +git checkout -b tm-base $TAG +git checkout -b tm +``` + +We created `tm-base` to ease rebasing and formatting patches below. Now go +over to the `tor-messenger-build` repo and get our patches, + +``` +cd projects/instantbird +cp 00* ~/tor-messenger # Assuming the above repo you created was in ~ +``` + +And apply them, + +``` +cd ~/tor-messenger +git branch # Should say "tm" from above +git am 00*.patch +rm 00* +``` + +Now you have a nice `tm` branch based on `$TAG` with all our patches. + +Adding or updating a patch +-------------------------- + +Generally, you'll want just want to do some work and `git commit` it on top. +Occasionally though, you'll need to make some changes to the patches we're +already maintaining. A good example of that is when Tor Browser updates, +you'll want to sync the preferences from `browser/app/profile/000-tor-browser.js` + +``` +git rebase -i tm-base +# Pick the first commit for editing, "Set Tor Messenger preferences" +``` + +Now copy the contents from the new `000-tor-browser.js` to `im/app/profile/all-instantbird.js` +being sure to lineup sections to produce a nice diff. Mark any new changes +where we deviate with `// TM`. (Note: This description is a little opaque +and can use some clarifying statements.) + +``` +git rebase --continue +``` + +Now, we're ready to export those changes and copy them back over to the +`tor-messenger-build` repo. + +``` +git format-patch tm-base +mv 00* ~/tor-messenger-build/projects/instantbird/ +``` + +Be sure to add / update any modified `-filename:` in the `config`. diff --git a/docs/release.md b/docs/release.md new file mode 100644 index 0000000..7f07fc1 --- /dev/null +++ b/docs/release.md @@ -0,0 +1,284 @@ +Release Process for Tor Messenger +================================= + +You are ready to release Tor Messenger when you have performed a substantial +development effort, or you have to patch a security issue. + +The release process is divided into two parts: building Tor Messenger, and +then signing the MAR files for secure automatic updates; follow this guide +step by step to complete both the steps. + +Building +======== + +- If not already done, bump the version number in `ChangeLog`, `rbm.conf`, + `tools/update-responses/config.yml` + +- Ensure `HEAD` on the build machines matches the `master` of + `tor-messenger-build.git` repository. + +- Run `make fetch` before the next step. + +- Run `make tor-messenger-release`. The builds will be in the + `release/$VERSION` directory, along with the MAR files. This will also + output the `sha256sum` of the files. + +- Compare the Linux builds with at least one other person -- preferably + building on another machine -- to check if they are reproducible. + +- Test the builds on all platforms: + + - Create an XMPP account and IRC account + + - Ensure that the corresponding OTR keys have been generated (Tools > + OTR Preferences > Private Keys) + + - Initiate an OTR conversation with another instance. Verify the + various authentication mechanisms. + +- If everything is fine, send the Windows and macOS builds (EXE and DMG) to + the Tor Browser team for code signing. + +**Wait to get the signed EXE and DMG back before proceeding to the next step** + +Making Update MARs +================== + +This step only works if you want to do an update build and have a base version +to diff against. So if you are upgrading from A to B, follow these steps; this +assumes that A is the older version and B is the newer one. + +**These steps are not required if you are doing a build for just A or B** + +- Navigate to the build directory on the build machine + +- `cd tor-messenger-build/release/ && mkdir -p tor-messenger/signed/$VERSION` + (where $VERSION is the version of the release, same as in rbm.conf). + +- You are now in the tor-messenger/signed/$VERSION/ directory + +- Copy all the release files from tor-messenger-release into this directory + + cp -r ../../../$VERSION/* . + + **If this is the first time you are doing an update, make sure the older + version is also present in the signed/ directory. For example if you are + building B for the first time, you should have A/ in the signed/ directory. + Repeat the above steps for A (if not already done):** + + mkdir -p tor-messenger/signed/A + cd A/ + cp -r ../../../A/* . + + **The `gen_incrementals' script will complain about this.** + +- Now copy the SIGNED Windows and macOS EXE and DMG files which the Tor + Browser team has uploaded. + + - Check this step again to ensure you have the signed binaries. Compare + the checksums! + +- At this stage, you have the code signed binaries and the unsigned complete + MARs. + +- Now go to `tor-messenger-build/tools/update-responses`. + +- Edit `config.yml`: + - Check and update the version in the `channel` section + - In `version`, add a new section (see existing sections for help) + corresponding to the release version + - Assume you are updating from A to B. Your `config.yml` should look like: + + channels: + release: B + B: + platformVersion: 45.6.0 + detailsURL: https://blog.torproject.org/blog/tor-messenger-B-released + incremental_from: + - A + + **Increment platformVersion if it has changed + Update detailsURL which will point to the blog post detailing the release** + +- Now run `./gen_incrementals`. In the `signed/$VERSION` directory, you should + see incremental MARs from A->B along with the existing complete MARs. + +- This completes the MAR generation step. The next step is signing, which + takes place offline. + +Signing Update MARs +=================== + +This step has to be performed offline and assumes you have the MAR signing +certificates and the private keys. + +**DO NOT copy the certificate directory to ANY remote machine** + +**This step works only on a Linux machine (32-bit or 64-bit)** + +Offline Steps Start +------------------- + +- Create a new local directory + +- Copy `signmars.py` from the build repository (`tor-messenger/tools/update-responses/`) + +- Copy the following files from the signed/ directory in the previous section + to the current local directory: + + mar-tools-linux*.zip + *.mar + + scp tor-messenger-build/release/tor-messenger/signed/$VERSION/{*.mar,mar-tools-linux*.zip} . + +- Set `NSS_DB_DIR` to point to the directory with the certificate files. You + should point to the directory with the `cert8.db` file. + +- Run `signmars.py` and follow the steps. The signed MARs will be in the + signed/ directory. + +- `cd signed/` + +- Upload the signed MARs back to the directory you copied them from. + + scp *.mar tor-messenger-build/release/tor-messenger/signed/$VERSION/ + +Offline Steps End +----------------- + +- Back to the build machine: navigate to tools/update-responses/. Run + `./update_responses` to generate the update manifest. + +- Generate the checksums for the builds: + + sha256sum `ls -I "*.zip" -I "*.txt"` > sha256sums-signed-build.txt + +- GPG sign the sha256sums-signed-build.txt file: + + - Copy the sha256sums-signed-build.txt to a local machine + + gpg -abs sha256sums-signed-build.txt + + - Upload the signature (*.asc) back to build machine signed/ directory. + +- At this stage, you have the code signed DMG and EXE, Linux builds, signed + MAR files, the update information, and the signed sha256sum of all files. + +Testing Updates +=============== + +Before we push the update to users, we should test them first to make sure +that incremental (or complete updates) are working as intended. We do this by +pushing the updates to the `update_2.test` directory instead of `update_2`. + +- Copy the `htdocs/release` directory from the last section to `aus2.torproject.org` + + staticiforme.torproject.org:/srv/aus2-master.torproject.org/htdocs/tormesse… + +**Make sure the .htaccess file is copied as well.** + +- ssh to `staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/tormessenger` + `mkdir $VERSION` to create the directory for the new version. + +- Copy the contents* of the signed/ directory (MAR files) to dist.tormessenger.org/tormessenger/$VERSION + + staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/tormesse… + + * - You can skip sha256sums-unsigned-build.txt since we don't use it. + +- ssh to `staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/tormessenger` + + - Run `ln -sfn $VERSION current` + This helps us ensure that the `current` directory always refers to the + latest release of Tor Messenger + + - Exit + +- We need to finalize the changes. Run: + + ssh staticiforme.torproject.org static-update-component dist.torproject.org && ssh staticiforme.torproject.org static-update-component aus2.torproject.org + +- Now test the updates on ALL platforms as it is possible that updates may + work on one but fail on the other. + + - Start Tor Messenger + + - Open the preferences editor and copy the value for preference `app.update.url` + + - Create a new string preference (Right click -> New -> String) and set + the name to `app.update.url.override`. Set the value copied from the + previous step REPLACING `update_2` with `update_2.test`. Your string + should be: + + https://aus2.torproject.org/tormessenger/update_2.test/%CHANNEL%/%BUILD_TAR… + + - Create a new boolean preference `app.update.log` and set it to `true` + + - Force an update by going to the about screen + + - Tor Messenger should update (incrementally) and then restart + + - The update should be applied on restart. If not, it should complain and + that means something is broken. Since we set `app.update.log` to `true`, + it's a good time to look at the error console + +If everything went on fine with the testing, move on to the next step. + +Finalizing Updates and Releasing +================================ + +- Publish the blog post on blog.torproject.org. The URL should follow the same + format as described in the `config.yml` file for $VERSION + +- ssh to `staticiforme.torproject.org:/srv/aus2-master.torproject.org/htdocs/tormessenger/update_2/release` + +- Delete the existing files and then copy the changes from the `test` directory: + + cp -R ../../update_2.test/release/. . + +- The update is still not live. To finalize it, exit, and then run: + + ssh staticiforme.torproject.org static-update-component aus2.torproject.org + +- The update is now live. Now is a good time to again test if the updates are + being properly pushed to the users! It may be a good idea to repeat the Tor + Messenger tests in the previous section. (Install older version, force + update, check.) + +- Finalize the release process by tagging the version in + `tor-messenger-build.git` (run the code below). Make sure that HEAD is the + commit which adds the release date to the ChangeLog. + + VERSION=`awk '/tormessenger_version/ {print $2}' rbm.conf | cut -d "'" -f2` + git tag -s v$VERSION -m "version $VERSION" + git push --tags + +- This completes the release process. + +After a Release +=============== + +- Bump up the version number in ChangeLog, rbm.conf, + tools/update-responses/config.yml for the next release + +- Increment the version number and update the links on + https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger + +- Administer the comments on the blog and reply to them. Open relevant tickets + wherever necessary. + +Troubleshooting +=============== + +- If you want to update add-ons like ctypes-otr or tor-launcher, make sure to + bump the version number in their `install.rdf` file. Add-ons are only + updated if the version number is incremented. + +- Any changes you make on staticiforme.torproject.org have to be finalized + with the `static-update-component $DIR` command. So if you have made changes + to `dist.torproject.org`, you have to run: + + ssh staticiforme.torproject.org static-update-component dist.torproject.org + +- Make sure `app.update.log` is set to `true` before testing updates since you + will get logging information as the update is applied, and if it fails.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2017