September 2018 - tor-commits - lists.torproject.org

[webwml/master] update links in README and include/README
by hiro＠torproject.org 13 Sep '18

13 Sep '18

commit 6716b35669ff8979b0c66f078aeb0875c0fac33b Author: traumschule <traumschuleriebau(a)riseup.net> Date: Fri Aug 31 14:04:32 2018 +0200 update links in README and include/README --- README.md | 2 ++ include/README | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1d29e191..6fea7568 100644 --- a/README.md +++ b/README.md @@ -59,6 +59,8 @@ You should now be able to point your browser at the locally generated site... file:///home/atagar/Desktop/tor/webwml/getinvolved/volunteer.html.en +For details on WML see +http://www.shlomifish.org/open-source/projects/website-meta-language/ ### Troubleshooting the build diff --git a/include/README b/include/README index 580b20fb..676e8387 100644 --- a/include/README +++ b/include/README @@ -2,7 +2,8 @@ Here's a brief overview of how our wml set-up works. ---------------------------------------------------- Here's a typical wml file: -https://svn.torproject.org/svn/website/trunk/en/bridges.wml +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/docs/en/bridges.wml +https://gitweb.torproject.org/project/web/webwml.git/docs/en/bridges.wml The top of the file has: @@ -25,12 +26,13 @@ and the middle is standard html, plus a few extra tags like pages when they exist. So that wml page produces this html page: https://www.torproject.org/bridges aka https://www.torproject.org/bridges.html.en +http://expyuzz4wqqyqhjn.onion/docs/bridges Then head.wmi and foot.wmi are just other mostly-html files you import to handle the repeat parts of each page (well, that plus some embedded perl scripts to generate some of the static content). -https://svn.torproject.org/svn/website/trunk/include/head.wmi -https://svn.torproject.org/svn/website/trunk/en/foot.wmi +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/head.wmi +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/foot.wmi You can basically ignore the wml part of them, and to a first approximation just think of them as more html. @@ -40,12 +42,12 @@ So in summary, wml is like html with a bit more markup. ---------------------------------------------------- Where it gets interesting is the download page: -https://svn.torproject.org/svn/website/trunk/en/easy-download.wml +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/download/en/download-easy.wml It has the standard header and footer section, but in the body of the page it includes links like <a href="<package-osx-bundle-stable>". Rather than putting URLs and Tor versions into every wml page, and then requiring the translators to update their page whenever we bump a version number, we instead define each URL and version as a new wml element: -https://svn.torproject.org/svn/website/trunk/include/versions.wmi +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/versions.wmi

1 0

[webwml/master] signing-keys: generate fingerprints from script (#22637)
by hiro＠torproject.org 13 Sep '18

13 Sep '18

commit d6608f6f949b0f7e4a9a0eabe3343ad5d3f4ef40 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Sat Sep 1 04:46:15 2018 +0200 signing-keys: generate fingerprints from script (#22637) To update docs/en/singing-keys.wmi execute the perl script docs/en/update_signing-keys.pl and commit include/keys.wmi Signing keys are stored in include/keys.txt --- docs/en/signing-keys.wml | 140 +----------------------------- docs/en/update_signing-keys.pl | 116 +++++++++++++++++++++++++ include/keys.txt | 32 +++++++ include/keys.wmi | 187 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 336 insertions(+), 139 deletions(-) diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml index d08b4033..42d7f3f7 100644 --- a/docs/en/signing-keys.wml +++ b/docs/en/signing-keys.wml @@ -12,145 +12,7 @@ <h1>Which PGP keys sign which packages</h1> <hr> - <p>The signing keys we use are:</p> - <ul> - <li>The Tor Browser Developers (0x4E2C6E8793298290), - Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), - Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265) - and Arthur Edelstein (0xD752F538C0D38C3A) - sign the Tor Browser releases.</li> - <li>Roger Dingledine (0x28988BF5 and 0x19F78451) or Nick Mathewson - (0xFE43009C4607B1FB with signing key 0x6AFEE6D49E92B601) - sign the Tor source code tarballs. (Nick's old key was 0x165733EA - with signing key 0x8D29319A; it signed older tarballs.)</li> - <li>Tor Project Archive (0x886DDD89) signs the deb.torproject.org - repositories and archives.</li> - <li>Damian Johnson (0x9ABBEEC6) signs Arm releases.</li> - <li>The Tails team (0x58ACD84F) signs the Tails live system releases.</li> - <li>David Goulet (0x42E86A2A11F48D36) signs Torsocks releases.</li> - <li>Sukhbir Singh (0xB01C8B006DA77FAA) signs Tor Messenger and TorBirdy releases.</li> - <li>Other developers include Peter Palfrader (0xC82E0039, or its - subkey 0xE1DEC577).</li> - </ul> - - The fingerprints for the keys should be: - - <pre> - pub 1024D/28988BF5 2000-02-27 - Key fingerprint = B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5 - uid Roger Dingledine <arma(a)mit.edu> - - pub 4096R/19F78451 2010-05-07 - Key fingerprint = F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451 - uid Roger Dingledine <arma(a)torproject.org> - sub 4096R/B0E5067D 2015-06-10 [expires: 2016-06-09] - - pub 4096R/FE43009C4607B1FB 2016-09-21 [expires: 2019-09-21] - Key fingerprint = 2133 BC60 0AB1 33E1 D826 D173 FE43 009C 4607 B1FB - uid Nick Mathewson <nickm(a)alum.mit.edu> - uid Nick Mathewson <nickm(a)wangafu.net> - uid Nick Mathewson <nickm(a)torproject.org> - uid Nick Mathewson <nickm(a)freehaven.net> - sub 4096R/6AFEE6D49E92B601 2016-09-23 [expires: 2018-09-23] - sub 4096R/91DDED0286AC8BFF 2016-09-23 [expires: 2018-09-23] - - pub 3072R/165733EA 2004-07-03 - Key fingerprint = B35B F85B F194 89D0 4E28 C33C 2119 4EBB 1657 33EA - uid Nick Mathewson <nickm(a)alum.mit.edu> - uid Nick Mathewson <nickm(a)wangafu.net> - uid Nick Mathewson <nickm(a)freehaven.net> - sub 3072R/8D29319A 2004-07-03 - sub 3072R/F25B8E5E 2004-07-03 - - pub 2048R/63FEE659 2003-10-16 - Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 - uid Erinn Clark <erinn(a)torproject.org> - sub 2048R/EB399FD7 2003-10-16 - - pub 1024D/F1F5C9B5 2010-02-03 - Key fingerprint = C2E3 4CFC 13C6 2BD9 2C75 79B5 6B8A AEB1 F1F5 C9B5 - uid Erinn Clark <erinn(a)torproject.org> - sub 1024g/7828F26A 2010-02-03 - - pub 2048R/886DDD89 2009-09-04 [expires: 2020-08-29] - Key fingerprint = A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89 - uid deb.torproject.org archive signing key - sub 2048R/219EC810 2009-09-04 [expires: 2018-08-30] - - pub 1024D/9ABBEEC6 2009-06-17 - Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4 5AD9 0445 B7AB 9ABB EEC6 - uid Damian Johnson <atagar(a)torproject.org> - sub 2048g/146276B2 2009-06-17 - sub 2048R/87F30690 2010-08-07 - - pub 8192R/683686CC 2013-09-11 - Key fingerprint = C963 C21D 6356 4E2B 10BB 335B 2984 6B3C 6836 86CC - uid Mike Perry (Regular use key) <mikeperry(a)torproject.org> - sub 4096R/0F129402 2015-09-07 [expires: 2016-09-11] - sub 4096R/ACC0A961 2015-09-07 [expires: 2016-09-11] - - pub 4096R/C5AA446D 2010-07-14 - Key fingerprint = 261C 5FBE 7728 5F88 FB0C 3432 66C8 C2D7 C5AA 446D - uid Sebastian Hahn <mail(a)sebastianhahn.net> - sub 2048R/A2499719 2010-07-14 - sub 2048R/140C961B 2010-07-14 - - pub 4096R/C82E0039 2003-03-24 - Key fingerprint = 25FC 1614 B8F8 7B52 FF2F 99B9 62AF 4031 C82E 0039 - uid Peter Palfrader <peter(a)palfrader.org> - uid Peter Palfrader <weasel(a)debian.org> - - pub 8192R/C11F6276 2012-07-21 - Key fingerprint = AD1A B35C 674D F572 FBCE 8B0A 6BC7 58CB C11F 6276 - uid David Fifield <david(a)bamsoftware.com> - sub 4096R/D90A8E40 2012-07-21 - sub 4096R/5CD388E5 2012-07-21 - - pub 4096R/23291265 2010-05-07 - Key fingerprint = 8C4C D511 095E 982E B0EF BFA2 1E8B F349 2329 1265 - uid Linus Nordberg <linus(a)torproject.org> - sub 4096R/B5F7D1B1 2016-04-14 [expires: 2017-04-14] - - pub rsa4096/0x94373AA94B7C3223 2013-07-30 - Key fingerprint = 35CD 74C2 4A9B 15A1 9E1A 81A1 9437 3AA9 4B7C 3223 - uid Georg Koppen <gk(a)torproject.org> - sub rsa4096/0x5778071EE2DE675B 2017-09-11 [expires: 2018-09-11] - sub rsa4096/0x72E841BB93148AD2 2017-09-11 [expires: 2018-09-11] - - pub 4096R/3E39CEABFC69F6F7 2015-09-24 - Key fingerprint = 6AB6 AEE9 776E 7827 23C8 ACE8 3E39 CEAB FC69 F6F7 - uid [ unknown] Nicolas Vigier (boklm) <boklm(a)torproject.org> - sub 4096R/07B7CFD7A0FBA062 2017-01-25 [expires: 2019-01-22] - - pub 2048R/D752F538C0D38C3A 2014-12-10 - Key fingerprint = 20B2 4CEF E6AF D615 0B6A 6F18 D752 F538 C0D3 8C3A - uid [ full ] Arthur Edelstein <arthuredelstein(a)gmail.com> - sub 2048R/3306E88D27211E0B 2014-12-10 - - pub 4096R/0x4E2C6E8793298290 2014-12-15 [expires: 2020-08-24] - Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 - uid Tor Browser Developers (signing key) <torbrowser(a)torproject.org> - sub 4096R/0xD1483FA6C3C07136 2016-08-24 [expires: 2018-08-24] - sub 4096R/0xEB774491D9FF06E2 2018-05-26 [expires: 2020-09-12] - - pub 2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2017-05-09] - Key fingerprint = B744 17ED DF22 AC9F 9E90 F491 42E8 6A2A 11F4 8D36 - uid David Goulet <dgoulet(a)torproject.org> - sub 4096g/FE9D6620 2011-05-11 [expires: 2017-05-09] - sub 4096R/93CC198D 2013-09-10 [expires: 2016-09-10] - - pub 4096R/0xB01C8B006DA77FAA 2016-02-25 [expires: 2020-02-24] - Key fingerprint = E4AC D397 5427 A5BA 8450 A1BE B01C 8B00 6DA7 7FAA - uid Sukhbir Singh <azadi(a)riseup.net> - uid Sukhbir Singh <sukhbir(a)torproject.org> - sub 4096R/0x1AF20C043D9F9289 2016-02-25 [expires: 2020-02-24] - - pub 4096R/58ACD84F 2015-01-18 [expires: 2017-01-11] - Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F - uid Tails developers <tails(a)boum.org> - sub 4096R/752A3DB6 2015-01-18 [expires: 2017-01-11] - sub 4096R/2F699C56 2015-01-18 [expires: 2017-01-11] - </pre> +#include "keys.wmi" TITLE="Tor Project: Signing keys" CHARSET="UTF-8" </div>  diff --git a/docs/en/update_signing-keys.pl b/docs/en/update_signing-keys.pl new file mode 100755 index 00000000..11c04eda --- /dev/null +++ b/docs/en/update_signing-keys.pl @@ -0,0 +1,116 @@ +#!/usr/bin/env perl +use strict; +use warnings; + +my $keysfile = "include/keys.txt"; +my $wmifile = 'include/keys.wmi'; +my $forcekeyupdates = 0; +my $skipkeyupdates = 0; + +# First we load the keys, then we create a wmi file which is included by +# https://www.torproject.org/docs/signing-keys.html.en + +# Determine the base directory in case we are called from somewhere else. +# We assume to sit in docs/en. Update $root path if this file has moved: +$0 =~ /^(.+)\/[^\/]+$/; +my $root = "$1/../.."; +chdir $root or die "Could not enter $root: $! (script path: $0)\n"; + +open my $kf, '<', "$keysfile" # read keys + or die "Could not open $keysfile: $!\n"; + +my %sections; # project => key owners +my %owners; # key owner => string with all keys +my @projects; # save sections in order of appearance +my $section; +foreach (<$kf>) { + # filters comment and empty lines + next if ($_ eq "\n"); + if (/^#/) { + # [section] / project + } elsif (/^\[(.+)\]$/) { + $section = "$1"; + $sections{"$section"} = (); + push (@projects, $section); + # key owner with list of key id(s) + } elsif (/^([^:]+):(.+)$/) { + my $owner = "$1"; + my $keys = "$2"; + push( @{$sections{"$section"}}, $owner); + $owners{"$owner"} = "$keys"; + # tell about unrecognized lines + } else { print "Ignored line: $_\n"; } +} +close $kf; +my @owners = keys %owners; +print "Loaded $keysfile. Found $#owners key owners in $#projects projects.\n"; + +# If the keysfile did not change since the last run, we will not update them. +# To update all keys anyway, set $forcekeyupdates = 1 above, or comment: +if (-f $wmifile && qx/[ $wmifile -nt $keysfile ]/) { + $forcekeyupdates or $skipkeyupdates++; +} + +open my $out, '>', "$wmifile" + or die "Could not write to $wmifile; $!\n"; +print $out "#!/usr/bin/env wml\n<p>The signing keys we use are:</p>\n<ul>\n"; +my %fingerprints; +foreach my $project (@projects) { + my $owners = ''; + my $suf = 's'; + my @keysinproject; + # we grab the key owners for each project and iterate over their keys + foreach my $owner (@{$sections{"$project"}}) { # iterate over owners + my $keys = $owners{"$owner"}; + # example for $keys: 0x165733EA, 0x8D29319A(signing key) + my $inbrackets = ''; + $suf = '' if ($owners ne ''); + my @keys = split (',', $keys); + foreach my $key (@keys) { # iterate over keys + # validate key format. all regexp are beautiful. + if ($key =~ /^\s?(0x[^$]+)(\(([^$]+)\))?/) { + my $key = $1; + push (@keysinproject, $key); + # named alternative key + if ($2) { + $inbrackets .= " with its $3 $key"; + # first key + } elsif ($inbrackets eq '') { + $inbrackets = "$key"; + # second key + } else { + $inbrackets .= " and $key"; + } + } else { # tell if the format is wrong + print "Unrecognized key format: $key\n"; + } + } + my $sep = ($owners eq '') ? '' : ', '; + # Add owner to the list + $owners .= "$sep$owner ($inbrackets)"; + print " - $owner ($inbrackets) [$project]\n"; + } + if ($project eq 'other') { + print $out "<li>Other developers include $owners.</li>\n"; + } else { + $suf = 'ed' if ($project =~ /older/); + print $out "<li>$owners sign$suf <strong>$project</strong></li>\n"; + } + my $keyids = join (' ', @keysinproject); + # update keys form keyserver pool + if ($forcekeyupdates or not $skipkeyupdates) { + print "Fetching $keyids from keyserver:\n"; + qx/gpg --recv-key $keyids/; + } + # save gpg output for later + my $str = qx/gpg --list-keys --keyid-format 0xlong --with-fingerprint $keyids/; + $str =~ s/</</g; $str =~ s/>/>/g; $str =~ s/@/#/g; # replace html codes + $fingerprints{"$project"} = "<pre>\n$str</pre>\n"; +} + +# print keys for each project to file +print $out "</ul>\n<h2>Fingerprints</h2>\n<p>The fingerprints for the keys are:</p>\n"; +foreach my $project (@projects) { + print $out "<h3>$project</h3>\n". $fingerprints{"$project"}; +} +close $out; print "Wrote $wmifile.\n"; exit 0; diff --git a/include/keys.txt b/include/keys.txt new file mode 100644 index 00000000..81b881cb --- /dev/null +++ b/include/keys.txt @@ -0,0 +1,32 @@ +[Tor Browser releases] +The Tor Browser Developers: 0x4E2C6E8793298290 +Mike Perry: 0x0E3A92E4 +Georg Koppen: 0x4B7C3223 +Nicolas Vigier: 0xD0220E4B +Linus Nordberg: 0x23291265 +Arthur Edelstein: 0xD752F538C0D38C3A + +[Tor source tarballs] +Roger Dingledine: 0x28988BF5, 0x19F78451 +Nick Mathewson: 0xFE43009C4607B1FB, 0x6AFEE6D49E92B601(signing key) + +[older Tor tarballs] +Nick Mathewson: 0x165733EA, 0x8D29319A(signing key) + +[deb.torproject.org repositories and archives] +Tor Project Archive: 0x886DDD89 + +[Arm releases] +Damian Johnson: 0x9ABBEEC6 + +[Tails live system releases] +The Tails team: 0x58ACD84F + +[Torsocks releases] +David Goulet: 0x42E86A2A11F48D36 + +[TorBirdy releases] +Sukhbir Singh: 0xB01C8B006DA77FAA + +[other] +Peter Palfrader: 0xC82E0039, 0xE1DEC577(subkey) diff --git a/include/keys.wmi b/include/keys.wmi new file mode 100644 index 00000000..89bfab17 --- /dev/null +++ b/include/keys.wmi @@ -0,0 +1,187 @@ +#!/usr/bin/env wml +<p>The signing keys we use are:</p> +<ul> +<li>The Tor Browser Developers (0x4E2C6E8793298290), Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265), Arthur Edelstein (0xD752F538C0D38C3A) sign <strong>Tor Browser releases</strong></li> +<li>Roger Dingledine (0x28988BF5 and 0x19F78451), Nick Mathewson (0x165733EA with its signing key 0x8D29319A) sign <strong>Tor source tarballs</strong></li> +<li>Nick Mathewson (0x165733EA with its signing key 0x8D29319A) signed <strong>older Tor tarballs</strong></li> +<li>Tor Project Archive (0x886DDD89) signs <strong>deb.torproject.org repositories and archives</strong></li> +<li>Damian Johnson (0x9ABBEEC6) signs <strong>Arm releases</strong></li> +<li>The Tails team (0x58ACD84F) signs <strong>Tails live system releases</strong></li> +<li>David Goulet (0x42E86A2A11F48D36) signs <strong>Torsocks releases</strong></li> +<li>Sukhbir Singh (0xB01C8B006DA77FAA) signs <strong>TorBirdy releases</strong></li> +<li>Other developers include Peter Palfrader (0xC82E0039 with its subkey 0xE1DEC577).</li> +</ul> +<h2>Fingerprints</h2> +<p>The fingerprints for the keys are:</p> +<h3>Tor Browser releases</h3> +<pre> +pub rsa4096/0x4E2C6E8793298290 2014-12-15 [C] [expires: 2020-08-24] + Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290 +uid [ unknown] Tor Browser Developers (signing key) <torbrowser#torproject.org> +sub rsa4096/0xEB774491D9FF06E2 2018-05-26 [S] [expires: 2020-09-12] + +pub rsa8192/0x29846B3C683686CC 2013-09-11 [SC] + Key fingerprint = C963 C21D 6356 4E2B 10BB 335B 2984 6B3C 6836 86CC +uid [ unknown] Mike Perry <mikeperry#endarken.info> +uid [ unknown] Mike Perry <mikeperry#unencrypted.info> +uid [ unknown] Mike Perry (Regular use key) <mikeperry#fscked.org> +uid [ unknown] Mike Perry (Regular use key) <mikeperry#torproject.org> +sub rsa4096/0x004AD1045BA0FE28 2017-10-31 [S] [expires: 2018-10-31] +sub rsa4096/0xEEC50E9938F9F4E9 2017-10-31 [E] [expires: 2018-10-31] + +pub rsa4096/0x4FEA46574B7C3223 2014-06-16 [SCEA] [revoked: 2016-08-16] + Key fingerprint = DFE0 2163 0B44 5B24 DE2D CDAC 4FEA 4657 4B7C 3223 +uid [ revoked] Georg Koppen <georg#getfoxyproxy.org> + +pub rsa4096/0x94373AA94B7C3223 2013-07-30 [SC] + Key fingerprint = 35CD 74C2 4A9B 15A1 9E1A 81A1 9437 3AA9 4B7C 3223 +uid [ unknown] Georg Koppen <gk#torproject.org> +uid [ unknown] Georg Koppen <groeg#vfemail.net> +uid [ unknown] Georg Koppen <georg#getfoxyproxy.org> +sub rsa4096/0x5778071EE2DE675B 2017-09-11 [E] [expires: 2018-09-11] +sub rsa4096/0x72E841BB93148AD2 2017-09-11 [S] [expires: 2018-09-11] + +pub rsa4096/0xE5B81856D0220E4B 2014-03-19 [SC] + Key fingerprint = 4A90 646C 0BAE D9D4 56AB 3111 E5B8 1856 D022 0E4B +uid [ unknown] Nicolas Vigier (TBB Builds Signing Key) <boklm#torproject.org> + +pub rsa4096/0x1E8BF34923291265 2010-05-07 [SC] + Key fingerprint = 8C4C D511 095E 982E B0EF BFA2 1E8B F349 2329 1265 +uid [ unknown] Linus Nordberg <linus#nordberg.se> +uid [ unknown] Linus Nordberg <linus#dfri.se> +uid [ unknown] Linus Nordberg <linus#sunet.se> +uid [ unknown] Linus Nordberg <linus#nordu.net> +uid [ unknown] Linus Nordberg <linus#torproject.org> +uid [ unknown] [jpeg image of size 2906] +sub rsa4096/0xC1788C2B0B3120D3 2018-02-17 [A] +sub rsa4096/0x9DC3E9C66DDABD48 2018-04-11 [E] [expires: 2019-04-11] + +pub rsa4096/0xAADF069E23291265 2014-06-16 [SCEA] [revoked: 2016-08-16] + Key fingerprint = 43D1 9E7B DB63 A474 0B0C B555 AADF 069E 2329 1265 +uid [ revoked] Linus Nordberg <linus#nordberg.se> + +pub rsa2048/0xD752F538C0D38C3A 2014-12-10 [SC] + Key fingerprint = 20B2 4CEF E6AF D615 0B6A 6F18 D752 F538 C0D3 8C3A +uid [ unknown] Arthur Edelstein <arthuredelstein#gmail.com> +sub rsa2048/0x3306E88D27211E0B 2014-12-10 [E] + +</pre> +<h3>Tor source tarballs</h3> +<pre> +pub dsa1024/0xEB5A896A28988BF5 2000-02-27 [SCA] + Key fingerprint = B117 2656 DFF9 83C3 042B C699 EB5A 896A 2898 8BF5 +uid [ unknown] Roger Dingledine <arma#mit.edu> +sub elg2048/0x147FF421788AFDCE 2000-02-27 [E] + +pub rsa1024/0x9C01813428988BF5 2014-06-16 [SCEA] [revoked: 2016-08-16] + Key fingerprint = 2629 5471 A26A B9F9 6C0C 45BB 9C01 8134 2898 8BF5 +uid [ revoked] Roger Dingledine <arma#mit.edu> + +pub rsa4096/0xC218525819F78451 2010-05-07 [SC] + Key fingerprint = F65C E37F 04BA 5B36 0AE6 EE17 C218 5258 19F7 8451 +uid [ unknown] Roger Dingledine <arma#mit.edu> +uid [ unknown] Roger Dingledine <arma#freehaven.net> +uid [ unknown] Roger Dingledine <arma#torproject.org> +sub rsa4096/0x1A61312B4600E8BE 2018-06-03 [E] [expires: 2019-06-03] + +pub rsa4096/0x468FAE2919F78451 2014-06-16 [SCEA] [revoked: 2016-08-16] + Key fingerprint = 9C95 0D05 FC80 2DFA 79C3 7629 468F AE29 19F7 8451 +uid [ revoked] Roger Dingledine <arma#mit.edu> + +pub rsa1024/0xD50624EC165733EA 2014-06-16 [SCEA] [revoked: 2016-08-16] + Key fingerprint = 33DC 81DC C099 4E0A 10D8 048B D506 24EC 1657 33EA +uid [ revoked] Nick Mathewson <nickm#alum.mit.edu> + +pub rsa3072/0x21194EBB165733EA 2004-07-03 [SC] + Key fingerprint = B35B F85B F194 89D0 4E28 C33C 2119 4EBB 1657 33EA +uid [ unknown] Nick Mathewson <nickm#alum.mit.edu> +uid [ unknown] Nick Mathewson <nickm#wangafu.net> +uid [ unknown] Nick Mathewson <nickm#freehaven.net> +uid [ unknown] [jpeg image of size 3369] +sub rsa3072/0x910397D88D29319A 2004-07-03 [S] +sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] + +</pre> +<h3>older Tor tarballs</h3> +<pre> +pub rsa1024/0xD50624EC165733EA 2014-06-16 [SCEA] [revoked: 2016-08-16] + Key fingerprint = 33DC 81DC C099 4E0A 10D8 048B D506 24EC 1657 33EA +uid [ revoked] Nick Mathewson <nickm#alum.mit.edu> + +pub rsa3072/0x21194EBB165733EA 2004-07-03 [SC] + Key fingerprint = B35B F85B F194 89D0 4E28 C33C 2119 4EBB 1657 33EA +uid [ unknown] Nick Mathewson <nickm#alum.mit.edu> +uid [ unknown] Nick Mathewson <nickm#wangafu.net> +uid [ unknown] Nick Mathewson <nickm#freehaven.net> +uid [ unknown] [jpeg image of size 3369] +sub rsa3072/0x910397D88D29319A 2004-07-03 [S] +sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] + +</pre> +<h3>deb.torproject.org repositories and archives</h3> +<pre> +pub rsa2048/0xEE8CBC9E886DDD89 2009-09-04 [SC] [expires: 2022-08-05] + Key fingerprint = A3C4 F0F9 79CA A22C DBA8 F512 EE8C BC9E 886D DD89 +uid [ unknown] deb.torproject.org archive signing key +sub rsa2048/0x74A941BA219EC810 2009-09-04 [S] [expires: 2020-11-23] + +</pre> +<h3>Arm releases</h3> +<pre> +pub rsa1024/0xF94ABB509ABBEEC6 2014-06-16 [SCEA] [revoked: 2016-08-16] + Key fingerprint = D8AA CF11 9067 89E8 91DD 2C27 F94A BB50 9ABB EEC6 +uid [ revoked] Damian Johnson (www.atagar.com) <atagar1#gmail.com> + +pub dsa1024/0x0445B7AB9ABBEEC6 2009-06-17 [SC] + Key fingerprint = 6827 8CC5 DD2D 1E85 C4E4 5AD9 0445 B7AB 9ABB EEC6 +uid [ unknown] Damian Johnson (www.atagar.com) <atagar1#gmail.com> +uid [ unknown] Damian Johnson <atagar#torproject.org> +sub rsa2048/0x888404C187F30690 2010-08-07 [S] +sub elg2048/0x04F1B63D146276B2 2009-06-17 [E] + +</pre> +<h3>Tails live system releases</h3> +<pre> +pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2019-01-11] + Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F +uid [ unknown] Tails developers <tails#boum.org> +uid [ unknown] Tails developers (offline long-term identity key) <tails#boum.org> +sub ed25519/0x90B2B4BD7AED235F 2017-08-28 [S] [expires: 2019-01-11] +sub rsa4096/0xD21DAD38AF281C0B 2017-08-28 [S] [expires: 2019-01-11] +sub rsa4096/0x3020A7A9C2B72733 2017-08-28 [S] [expires: 2019-01-11] + +</pre> +<h3>Torsocks releases</h3> +<pre> +pub rsa2048/0x42E86A2A11F48D36 2011-05-11 [SC] [expires: 2019-05-01] + Key fingerprint = B744 17ED DF22 AC9F 9E90 F491 42E8 6A2A 11F4 8D36 +uid [ unknown] David Goulet <dgoulet#ev0ke.net> +uid [ unknown] David Goulet <dgoulet#riseup.net> +uid [ unknown] David Goulet <dgoulet#torproject.org> +sub rsa4096/0x2AC6036C93CC198D 2013-09-10 [E] [expires: 2019-08-17] + +</pre> +<h3>TorBirdy releases</h3> +<pre> +pub rsa4096/0xB01C8B006DA77FAA 2016-02-25 [SC] [expires: 2020-02-24] + Key fingerprint = E4AC D397 5427 A5BA 8450 A1BE B01C 8B00 6DA7 7FAA +uid [ unknown] Sukhbir Singh <azadi#riseup.net> +uid [ unknown] Sukhbir Singh <sukhbir#torproject.org> +sub rsa4096/0x1AF20C043D9F9289 2016-02-25 [E] [expires: 2020-02-24] + +</pre> +<h3>other</h3> +<pre> +pub rsa4096/0x62AF4031C82E0039 2003-03-24 [SC] [expires: 2024-08-28] + Key fingerprint = 25FC 1614 B8F8 7B52 FF2F 99B9 62AF 4031 C82E 0039 +uid [ unknown] Peter Palfrader +uid [ unknown] Peter Palfrader <weasel#debian.org> +uid [ unknown] Peter Palfrader <peter#palfrader.org> +sub rsa2048/0x8602C8203872331F 2014-05-04 [S] [expires: 2020-09-01] +sub rsa2048/0xE377AED938E4E080 2014-05-04 [E] [expires: 2020-09-01] + +pub rsa4096/0x7675B62DC82E0039 2014-06-16 [SCEA] [revoked: 2016-08-16] + Key fingerprint = A110 43D3 C8A6 395D DDD0 EE85 7675 B62D C82E 0039 +uid [ revoked] Peter Palfrader + +</pre>

1 0

[webwml/master] signing-keys: replace some short with long ids
by hiro＠torproject.org 13 Sep '18

13 Sep '18

commit 8057006c079517ccda531cc20d982888a29e92d6 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Sat Sep 1 04:58:23 2018 +0200 signing-keys: replace some short with long ids --- include/keys.txt | 10 +++++----- include/keys.wmi | 12 ++++-------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/include/keys.txt b/include/keys.txt index 81b881cb..a9868a58 100644 --- a/include/keys.txt +++ b/include/keys.txt @@ -1,8 +1,8 @@ [Tor Browser releases] The Tor Browser Developers: 0x4E2C6E8793298290 -Mike Perry: 0x0E3A92E4 +Mike Perry: 0x29846B3C683686CC Georg Koppen: 0x4B7C3223 -Nicolas Vigier: 0xD0220E4B +Nicolas Vigier: 0xE5B81856D0220E4B Linus Nordberg: 0x23291265 Arthur Edelstein: 0xD752F538C0D38C3A @@ -14,13 +14,13 @@ Nick Mathewson: 0xFE43009C4607B1FB, 0x6AFEE6D49E92B601(signing key) Nick Mathewson: 0x165733EA, 0x8D29319A(signing key) [deb.torproject.org repositories and archives] -Tor Project Archive: 0x886DDD89 +Tor Project Archive: 0xEE8CBC9E886DDD89 [Arm releases] Damian Johnson: 0x9ABBEEC6 [Tails live system releases] -The Tails team: 0x58ACD84F +The Tails team: 0xDBB802B258ACD84F [Torsocks releases] David Goulet: 0x42E86A2A11F48D36 @@ -29,4 +29,4 @@ David Goulet: 0x42E86A2A11F48D36 Sukhbir Singh: 0xB01C8B006DA77FAA [other] -Peter Palfrader: 0xC82E0039, 0xE1DEC577(subkey) +Peter Palfrader: 0x62AF4031C82E0039 diff --git a/include/keys.wmi b/include/keys.wmi index 89bfab17..9bb30369 100644 --- a/include/keys.wmi +++ b/include/keys.wmi @@ -1,15 +1,15 @@ #!/usr/bin/env wml <p>The signing keys we use are:</p> <ul> -<li>The Tor Browser Developers (0x4E2C6E8793298290), Mike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265), Arthur Edelstein (0xD752F538C0D38C3A) sign <strong>Tor Browser releases</strong></li> +<li>The Tor Browser Developers (0x4E2C6E8793298290), Mike Perry (0x29846B3C683686CC), Georg Koppen (0x4B7C3223), Nicolas Vigier (0xE5B81856D0220E4B), Linus Nordberg (0x23291265), Arthur Edelstein (0xD752F538C0D38C3A) sign <strong>Tor Browser releases</strong></li> <li>Roger Dingledine (0x28988BF5 and 0x19F78451), Nick Mathewson (0x165733EA with its signing key 0x8D29319A) sign <strong>Tor source tarballs</strong></li> <li>Nick Mathewson (0x165733EA with its signing key 0x8D29319A) signed <strong>older Tor tarballs</strong></li> -<li>Tor Project Archive (0x886DDD89) signs <strong>deb.torproject.org repositories and archives</strong></li> +<li>Tor Project Archive (0xEE8CBC9E886DDD89) signs <strong>deb.torproject.org repositories and archives</strong></li> <li>Damian Johnson (0x9ABBEEC6) signs <strong>Arm releases</strong></li> -<li>The Tails team (0x58ACD84F) signs <strong>Tails live system releases</strong></li> +<li>The Tails team (0xDBB802B258ACD84F) signs <strong>Tails live system releases</strong></li> <li>David Goulet (0x42E86A2A11F48D36) signs <strong>Torsocks releases</strong></li> <li>Sukhbir Singh (0xB01C8B006DA77FAA) signs <strong>TorBirdy releases</strong></li> -<li>Other developers include Peter Palfrader (0xC82E0039 with its subkey 0xE1DEC577).</li> +<li>Other developers include Peter Palfrader (0x62AF4031C82E0039).</li> </ul> <h2>Fingerprints</h2> <p>The fingerprints for the keys are:</p> @@ -180,8 +180,4 @@ uid [ unknown] Peter Palfrader <peter#palfrader.org> sub rsa2048/0x8602C8203872331F 2014-05-04 [S] [expires: 2020-09-01] sub rsa2048/0xE377AED938E4E080 2014-05-04 [E] [expires: 2020-09-01] -pub rsa4096/0x7675B62DC82E0039 2014-06-16 [SCEA] [revoked: 2016-08-16] - Key fingerprint = A110 43D3 C8A6 395D DDD0 EE85 7675 B62D C82E 0039 -uid [ revoked] Peter Palfrader - </pre>

1 0

[webwml/master] fix links in include/README
by hiro＠torproject.org 13 Sep '18

13 Sep '18

commit 455b29bfb3e8e806971e34739b93ef151704ea6d Author: traumschule <traumschuleriebau(a)riseup.net> Date: Tue Sep 4 18:41:41 2018 +0200 fix links in include/README --- include/README | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/include/README b/include/README index 676e8387..05a00f3c 100644 --- a/include/README +++ b/include/README @@ -2,8 +2,8 @@ Here's a brief overview of how our wml set-up works. ---------------------------------------------------- Here's a typical wml file: -http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/docs/en/bridges.wml -https://gitweb.torproject.org/project/web/webwml.git/docs/en/bridges.wml +https://gitweb.torproject.org/project/web/webwml.git/tree/docs/en/bridges.wml +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/docs/en/bridges.wml The top of the file has: @@ -26,13 +26,16 @@ and the middle is standard html, plus a few extra tags like pages when they exist. So that wml page produces this html page: https://www.torproject.org/bridges aka https://www.torproject.org/bridges.html.en +https://www.torproject.org/docs/bridges http://expyuzz4wqqyqhjn.onion/docs/bridges Then head.wmi and foot.wmi are just other mostly-html files you import to handle the repeat parts of each page (well, that plus some embedded perl scripts to generate some of the static content). -http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/head.wmi -http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/foot.wmi +https://gitweb.torproject.org/project/web/webwml.git/tree/include/head.wmi +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/include/head.wmi +https://gitweb.torproject.org/project/web/webwml.git/tree/include/foot.wmi +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/include/foot.wmi You can basically ignore the wml part of them, and to a first approximation just think of them as more html. @@ -42,12 +45,13 @@ So in summary, wml is like html with a bit more markup. ---------------------------------------------------- Where it gets interesting is the download page: -http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/download/en/download-easy.wml +https://gitweb.torproject.org/project/web/webwml.git/tree/download/en/download-easy.wml +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/download/en/download-easy.wml It has the standard header and footer section, but in the body of the page it includes links like <a href="<package-osx-bundle-stable>". Rather than putting URLs and Tor versions into every wml page, and then requiring the translators to update their page whenever we bump a version number, we instead define each URL and version as a new wml element: -http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/include/versions.wmi - +https://gitweb.torproject.org/project/web/webwml.git/tree/include/versions.wmi +http://jqs44zhtxl2uo6gk.onion/project/web/webwml.git/tree/include/versions.wmi

1 0

[webwml/master] Merge branch 'signing-keys'
by hiro＠torproject.org 13 Sep '18

13 Sep '18

commit daa743880552e660862c4ba4ab102317d788f783 Merge: 8c324824 455b29bf Author: hiro <hiro(a)torproject.org> Date: Thu Sep 13 15:58:28 2018 +0200 Merge branch 'signing-keys'

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 13 Sep '18

13 Sep '18

commit 1c3e538861e3f3d4d5676e22274cd0c42c521bc8 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 13 12:48:59 2018 +0000 Update translations for support-portal --- contents+pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+pt_BR.po b/contents+pt_BR.po index 78419664d..589890b02 100644 --- a/contents+pt_BR.po +++ b/contents+pt_BR.po @@ -4372,7 +4372,7 @@ msgstr "" #: http//localhost/operators/operators-4/ #: (content/operators/operators-4/contents+en.lrquestion.description) msgid "$ deb-src http://deb.torproject.org/torproject.org <version> main" -msgstr "" +msgstr "$ deb-src http://deb.torproject.org/torproject.org <version> main" #: http//localhost/tbb/tbb-36/ #: (content/tbb/tbb-36/contents+en.lrquestion.description)

1 0

[torbutton/master] Bug 27478: Torbutton icons for dark theme
by gk＠torproject.org 13 Sep '18

13 Sep '18

commit 9156c5564a5da6bd8e17eab094d655034e4135b6 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Sep 13 02:18:41 2018 -0700 Bug 27478: Torbutton icons for dark theme --- src/chrome/skin/torbutton-dark-update-needed.svg | 13 +++++++++++++ src/chrome/skin/torbutton-dark.svg | 9 +++++++++ src/chrome/skin/torbutton.css | 15 +++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/src/chrome/skin/torbutton-dark-update-needed.svg b/src/chrome/skin/torbutton-dark-update-needed.svg new file mode 100644 index 00000000..44df4a00 --- /dev/null +++ b/src/chrome/skin/torbutton-dark-update-needed.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor-Update---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"> + <g id="Tor-Button-Icon" fill="#F9F9FA" fill-opacity="0.8"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 Z" id="Half-Content"></path> + </g> + <g id="!" transform="translate(0.000000, 6.100000)"> + <polygon id="Triangle-Copy" fill="#414141" points="5 0.714285714 9.28571429 9.28571429 0.714285714 9.28571429"></polygon> + <path d="M9.78067261,7.86561722 C10.0020131,8.30856238 9.97819173,8.83453755 9.71771774,9.25566142 C9.45724375,9.6767853 8.9972698,9.93299087 8.50210118,9.93276007 L1.42710118,9.93276007 C0.932880889,9.93225088 0.474029854,9.67633171 0.213899592,9.2561101 C-0.0462306709,8.83588849 -0.0706843715,8.31106384 0.149244037,7.86847436 L3.68710118,0.789902932 C3.92904842,0.305811394 4.42377158,0 4.96495832,0 C5.50614506,0 6.00086822,0.305811394 6.24281547,0.789902932 L9.78067261,7.86561722 Z M4.25067261,2.78990293 L4.25067261,5.64704579 C4.25067261,6.0415349 4.57046922,6.3613315 4.96495832,6.3613315 C5.35944743,6.3613315 5.67924404,6.0415349 5.67924404,5.64704579 L5.67924404,2.78990293 C5.67924404,2.39541382 5.35944743,2.07561722 4.96495832,2.07561722 C4.57046922,2.07561722 4.25067261,2.39541382 4.25067261,2.78990293 Z M4.96495832,8.68276007 C5.45806971,8.68276007 5.85781547,8.28301432 5.85781547,7.78990293 C5.85781547,7.29679155 5.45806971,6.89704579 4.96495832,6.89704579 C4.47 184694,6.89704579 4.07210118,7.29679155 4.07210118,7.78990293 C4.07210118,8.28301432 4.47184694,8.68276007 4.96495832,8.68276007 Z" id="Shape-Copy" fill="#FFE900" fill-rule="nonzero"></path> + </g> + </g> +</svg> diff --git a/src/chrome/skin/torbutton-dark.svg b/src/chrome/skin/torbutton-dark.svg new file mode 100644 index 00000000..55d633e8 --- /dev/null +++ b/src/chrome/skin/torbutton-dark.svg @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> + <g id="Icon---Tor---Grey10" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8"> + <g id="Tor-Button-Icon" fill="#F9F9FA"> + <path d="M7.06561268,5.02241519 C6.77772045,5.2116121 5.67952408,5.90554501 5.6853992,5.90178938 C5.35790364,6.11113858 5.09635335,6.28354515 4.86413018,6.44457064 C4.45268439,6.72987059 4.15887546,6.96359333 3.97499388,7.15193679 C2.95731966,8.16499644 2.66333288,8.97771922 2.77290903,10.3548433 C2.86347409,11.8242645 4.01769529,13.1628244 5.73360996,13.7141752 C6.42393225,13.9308094 7.08993386,14 8.24418607,14 C9.69409954,14 11.010192,13.6175745 11.8475477,12.9475461 C12.7611494,12.2214478 13.2954545,11.1244618 13.2954545,10.0058997 C13.2954545,8.86286776 12.7876949,7.76058164 11.8769727,6.9600938 C11.3838667,6.53505399 10.722397,6.11798563 9.75901067,5.60447735 C9.08955454,5.26286683 8.4719792,4.75203246 8.02479915,4.11379651 C7.77978416,4.4739196 7.45874047,4.78154253 7.06561268,5.02241519 Z M13.1898674,5.45132743 C14.5364638,6.63126844 15.2954545,8.28318584 15.2954545,10.0058997 C15.2954545,11.7286136 14.4874967,13.4041298 13.0919331,14.5132743 C11.7943039,15.551622 4 9.98251962,16 8.24418607,16 C7.16690894,16 6.1875661,15.9528024 5.13477254,15.6224189 C2.71089901,14.8436578 0.923598318,12.8613569 0.776696891,10.4778761 C0.629795465,8.63716814 1.07049974,7.22123894 2.56399758,5.73451327 C3.32298828,4.95575221 4.88993683,4.05899705 5.96721396,3.35103245 C6.50585253,3.02064897 7.06897466,2.02949853 5.99169753,0.16519174 L6.21204967,0 L9.41939748,1.27433628 C8.97869321,2.64306785 10.2518389,3.61061947 10.6680596,3.82300885 C11.5984353,4.31858407 12.4798439,4.83775811 13.1898674,5.45132743 Z" id="Border" fill-rule="nonzero"></path> + <path d="M8.27272727,5 C8.49625435,5.67889606 9.03172133,6.21869701 9.63636041,6.5268042 C10.3279607,6.89485621 10.8036714,7.19446079 11.1684763,7.5087455 C11.8759239,8.12902347 12.2727273,8.98864463 12.2727273,9.88278877 C12.2727273,10.7655864 11.852758,11.6266312 11.1353943,12.1959748 C10.4876507,12.713565 9.5005326,13 8.42423809,13 C8.37244863,13 8.32197458,12.9998006 8.27272727,12.9993871 L8.27272727,5 Z" id="Half-Content"></path> + </g> + </g> +</svg> diff --git a/src/chrome/skin/torbutton.css b/src/chrome/skin/torbutton.css index cf90ae6d..928ba93d 100644 --- a/src/chrome/skin/torbutton.css +++ b/src/chrome/skin/torbutton.css @@ -6,10 +6,21 @@ list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } } +@keyframes blink-update-dark { + 0% { + list-style-image: url("chrome://torbutton/skin/torbutton-dark-update-needed.svg"); + } + 100% { + list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); + } +} #torbutton-button { list-style-image: url("chrome://torbutton/skin/torbutton.svg"); } +toolbar[brighttext] #torbutton-button { + list-style-image: url("chrome://torbutton/skin/torbutton-dark.svg"); +} #torbutton-button[tbstatus="on"] { opacity: 1.0; } @@ -20,6 +31,10 @@ opacity: 1.0; animation: blink-update normal 1s infinite ease-in-out; } +toolbar[brighttext] #torbutton-button[tbUpdateNeeded="true"] { + opacity: 1.0; + animation: blink-update-dark normal 1s infinite ease-in-out; +} #torbutton-button-tb { list-style-image: url("chrome://torbutton/skin/torbutton.svg");

1 0

[tor/master] conn: Fix memleaks in retry_all_listeners
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit 4b646e30d8364e56fb6ae4ce5850f01e714eabcb Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Sep 12 17:51:52 2018 -0400 conn: Fix memleaks in retry_all_listeners Fixes #27670 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/core/mainloop/connection.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 3c057ad14..7ef7423b1 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -2900,6 +2900,9 @@ retry_all_listeners(smartlist_t *new_conns, int close_all_noncontrol) } SMARTLIST_FOREACH_END(conn); smartlist_free(listeners); + /* Cleanup any remaining listener replacement. */ + SMARTLIST_FOREACH(replacements, listener_replacement_t *, r, tor_free(r)); + smartlist_free(replacements); if (old_or_port != router_get_advertised_or_port(options) || old_or_port_ipv6 != router_get_advertised_or_port_by_af(options,

1 0

[tor/master] Report UNIX connection addresses that we opened correctly.
by nickm＠torproject.org 13 Sep '18

13 Sep '18

commit fed2c26e6028ee2ab77ad47ce91b6676fc2b31a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 12 17:42:24 2018 -0400 Report UNIX connection addresses that we opened correctly. This is an aside on ticket27670. --- src/core/mainloop/connection.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index ffc9010fb..3c057ad14 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1506,8 +1506,13 @@ connection_listener_new(const struct sockaddr *listensockaddr, */ connection_check_oos(get_n_open_sockets(), 0); - log_notice(LD_NET, "Opened %s on %s", - conn_type_to_string(type), fmt_addrport(&addr, usePort)); + if (conn->socket_family == AF_UNIX) { + log_notice(LD_NET, "Opened %s on %s", + conn_type_to_string(type), conn->address); + } else { + log_notice(LD_NET, "Opened %s on %s", + conn_type_to_string(type), fmt_addrport(&addr, usePort)); + } return conn; err:

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 13 Sep '18

13 Sep '18

commit 5312d60a3c25e93b960d26bbffeec0e903406934 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 13 11:16:07 2018 +0000 Update translations for tails-misc --- id.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/id.po b/id.po index e44a85849..764ae7715 100644 --- a/id.po +++ b/id.po @@ -8,6 +8,7 @@ # Dwi Cahyono <dwexz_cie(a)yahoo.com>, 2015 # Frengky Sinaga <frengkys5(a)gmail.com>, 2016 # Ibnu Daru Aji, 2014 +# ical, 2018 # se7entime <se7entime(a)openmailbox.org>, 2015 # L1Nus <multazam_ali(a)me.com>, 2014 # Robert Dafis <robertdafis(a)gmail.com>, 2018 @@ -19,8 +20,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-09-04 11:37+0200\n" -"PO-Revision-Date: 2018-09-04 14:30+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-09-13 10:59+0000\n" +"Last-Translator: ical\n" "Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -57,13 +58,13 @@ msgstr "<h1>Bantu kami memperbaiki kutu!</h1>\n<p>Baca <a href=\"%s\">panduan pe msgid "" "You can install additional software automatically from your persistent " "storage when starting Tails." -msgstr "" +msgstr "Anda dapat memasang perangkat lunak tambahan secara otomatis dari tempat penyimpanan tetap saat memulai Tails." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77 msgid "" "The following software is installed automatically from your persistent " "storage when starting Tails." -msgstr "" +msgstr "Perangkat lunak ini terpasang secara otomatis dari tempat penyimpanan tetap saat memulai Tails." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:132 #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:169 @@ -71,11 +72,11 @@ msgid "" "To add more, install some software using <a " "href=\"synaptic.desktop\">Synaptic Package Manager</a> or <a " "href=\"org.gnome.Terminal.desktop\">APT on the command line</a>." -msgstr "" +msgstr "Untuk menambah, pasang perangkat lunak menggunakan <a href=\"synaptic.desktop\">Synaptic Package Manager</a> atau <a href=\"org.gnome.Terminal.desktop\">APT pada baris perintah</a>." #: config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:151 msgid "_Create persistent storage" -msgstr "" +msgstr "_Buat tempat penyimpanan tetap" #: config/chroot_local-includes/usr/local/bin/electrum:57 msgid "Persistence is disabled for Electrum" @@ -195,7 +196,7 @@ msgstr "menambah {paket} untuk perangkat lunak tambahanmu" msgid "" "To install it automatically from your persistent storage when starting " "Tails." -msgstr "" +msgstr "Untuk memasangnya secara otomatis dari tempat penyimpanan tetap Anda saat memulai Tails." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:285 msgid "Install Every Time" @@ -210,13 +211,13 @@ msgstr "Memasang Hanya Sekali" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:320 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:355 msgid "The configuration of your additional software failed." -msgstr "" +msgstr "Konfigurasi pada perangkat lunak tambahan Anda gagal." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:311 msgid "" "To install it automatically when starting Tails, you can create a persistent" " storage and activate the <b>Additional Software</b> feature." -msgstr "" +msgstr "Untuk memasang secara otomatis saat memulai Tails, Anda dapat membuat tempat penyimpanan tetap dan mengaktifkan fitur <b>Perangkat Lunak Tambahan</b>." #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:314 msgid "Create Persistent Storage"

1 0