January 2019 - tor-commits - lists.torproject.org

[webwml/staging] use long key id's and rerun script
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit e85ce2e33e0a635878efe65b83299b45c5208495 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Dec 26 02:05:21 2018 -0500 use long key id's and rerun script which fixes some of the fake keys on the signing key page :/ --- include/keys.txt | 6 ++-- include/keys.wmi | 106 +++++++++++++++++++++---------------------------------- 2 files changed, 44 insertions(+), 68 deletions(-) diff --git a/include/keys.txt b/include/keys.txt index 826467a5..aa05b0b6 100644 --- a/include/keys.txt +++ b/include/keys.txt @@ -6,17 +6,17 @@ Nicolas Vigier: 0x3E39CEABFC69F6F7 Arthur Edelstein: 0xD752F538C0D38C3A [Tor source tarballs] -Roger Dingledine: 0x28988BF5, 0x19F78451 +Roger Dingledine: 0xEB5A896A28988BF5, 0xC218525819F78451 Nick Mathewson: 0xFE43009C4607B1FB, 0x6AFEE6D49E92B601(signing key) [older Tor tarballs] -Nick Mathewson: 0x165733EA, 0x8D29319A(signing key) +Nick Mathewson: 0x21194EBB165733EA, 0x21194EBB165733EA(signing key) [deb.torproject.org repositories and archives] Tor Project Archive: 0xEE8CBC9E886DDD89 [Arm releases] -Damian Johnson: 0x9ABBEEC6 +Damian Johnson: 0x0445B7AB9ABBEEC6 [Tails live system releases] The Tails team: 0xDBB802B258ACD84F diff --git a/include/keys.wmi b/include/keys.wmi index c163717a..6e6b58c7 100644 --- a/include/keys.wmi +++ b/include/keys.wmi @@ -6,15 +6,15 @@ To learn how to verify signatures, see <a href="<page docs/signing-keys>"> our manual</a>. </p> <p> -As of 8/118 the signing keys we use are: +As of 11/118 the signing keys we use are: </p> <ul> <li>The Tor Browser Developers (<a href='https://pgp.mit.edu/pks/lookup?search=0x4E2C6E8793298290&op=vindex&exact=on'>0x4E2C6E8793298290</a>), Mike Perry (<a href='https://pgp.mit.edu/pks/lookup?search=0x29846B3C683686CC&op=vindex&exact=on'>0x29846B3C683686CC</a>), Georg Koppen (<a href='https://pgp.mit.edu/pks/lookup?search=0xD1483FA6C3C07136&op=vindex&exact=on'>0xD1483FA6C3C07136</a>), Nicolas Vigier (<a href='https://pgp.mit.edu/pks/lookup?search=0x3E39CEABFC69F6F7&op=vindex&exact=on'>0x3E39CEABFC69F6F7</a>), Arthur Edelstein (<a href='https://pgp.mit.edu/pks/lookup?search=0xD752F538C0D38C3A&op=vindex&exact=on'>0xD752F538C0D38C3A</a>) sign <strong>Tor Browser releases</strong></li> -<li>Roger Dingledine (<a href='https://pgp.mit.edu/pks/lookup?search=0x28988BF5&op=vindex&exact=on'>0x28988BF5</a> and <a href='https://pgp.mit.edu/pks/lookup?search=0x19F78451&op=vindex&exact=on'>0x19F78451</a>), Nick Mathewson (<a href='https://pgp.mit.edu/pks/lookup?search=0x165733EA&op=vindex&exact=on'>0x165733EA</a>) sign <strong>Tor source tarballs</strong></li> -<li>Nick Mathewson (<a href='https://pgp.mit.edu/pks/lookup?search=0x165733EA&op=vindex&exact=on'>0x165733EA</a>) signed <strong>older Tor tarballs</strong></li> +<li>Roger Dingledine (<a href='https://pgp.mit.edu/pks/lookup?search=0xEB5A896A28988BF5&op=vindex&exact=on'>0xEB5A896A28988BF5</a> and <a href='https://pgp.mit.edu/pks/lookup?search=0xC218525819F78451&op=vindex&exact=on'>0xC218525819F78451</a>), Nick Mathewson (<a href='https://pgp.mit.edu/pks/lookup?search=0x21194EBB165733EA&op=vindex&exact=on'>0x21194EBB165733EA</a>) sign <strong>Tor source tarballs</strong></li> +<li>Nick Mathewson (<a href='https://pgp.mit.edu/pks/lookup?search=0x21194EBB165733EA&op=vindex&exact=on'>0x21194EBB165733EA</a>) signed <strong>older Tor tarballs</strong></li> <li>Tor Project Archive (<a href='https://pgp.mit.edu/pks/lookup?search=0xEE8CBC9E886DDD89&op=vindex&exact=on'>0xEE8CBC9E886DDD89</a>) signs <strong>deb.torproject.org repositories and archives</strong></li> -<li>Damian Johnson (<a href='https://pgp.mit.edu/pks/lookup?search=0x9ABBEEC6&op=vindex&exact=on'>0x9ABBEEC6</a>) signs <strong>Arm releases</strong></li> +<li>Damian Johnson (<a href='https://pgp.mit.edu/pks/lookup?search=0x0445B7AB9ABBEEC6&op=vindex&exact=on'>0x0445B7AB9ABBEEC6</a>) signs <strong>Arm releases</strong></li> <li>The Tails team (<a href='https://pgp.mit.edu/pks/lookup?search=0xDBB802B258ACD84F&op=vindex&exact=on'>0xDBB802B258ACD84F</a>) signs <strong>Tails live system releases</strong></li> <li>David Goulet (<a href='https://pgp.mit.edu/pks/lookup?search=0x42E86A2A11F48D36&op=vindex&exact=on'>0x42E86A2A11F48D36</a>) signs <strong>Torsocks releases</strong></li> <li>Sukhbir Singh (<a href='https://pgp.mit.edu/pks/lookup?search=0xB01C8B006DA77FAA&op=vindex&exact=on'>0xB01C8B006DA77FAA</a>) signs <strong>TorBirdy releases</strong></li> @@ -27,31 +27,27 @@ As of 8/118 the signing keys we use are: <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> +uid [ full ] Tor Browser Developers (signing key) <torbrowser#torproject.org> sub rsa4096/0xEB774491D9FF06E2 2018-05-26 [S] [expires: 2020-09-12] Key fingerprint = 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2 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 (Regular use key) <mikeperry#torproject.org> 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] - Key fingerprint = 7AB6 A050 C544 CB16 60A9 F1E9 004A D104 5BA0 FE28 -sub rsa4096/0xEEC50E9938F9F4E9 2017-10-31 [E] [expires: 2018-10-31] - Key fingerprint = B403 E911 BA38 63DB ED82 C57C EEC5 0E99 38F9 F4E9 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> +uid [ full ] Tor Browser Developers (signing key) <torbrowser#torproject.org> sub rsa4096/0xEB774491D9FF06E2 2018-05-26 [S] [expires: 2020-09-12] Key fingerprint = 1107 75B5 D101 FB36 BC6C 911B EB77 4491 D9FF 06E2 pub rsa4096/0x3E39CEABFC69F6F7 2015-09-24 [SC] Key fingerprint = 6AB6 AEE9 776E 7827 23C8 ACE8 3E39 CEAB FC69 F6F7 -uid [ unknown] Nicolas Vigier (boklm) <boklm#torproject.org> -uid [ unknown] Nicolas Vigier (boklm) <boklm#mars-attacks.org> +uid [ full ] Nicolas Vigier (boklm) <boklm#torproject.org> +uid [ full ] Nicolas Vigier (boklm) <boklm#mars-attacks.org> sub rsa4096/0xA0312B06D9535729 2016-04-23 [A] Key fingerprint = 1315 2F30 FFFE 0EC8 DF58 94FB A031 2B06 D953 5729 sub rsa4096/0x07B7CFD7A0FBA062 2017-01-25 [S] [expires: 2019-01-22] @@ -70,36 +66,24 @@ sub rsa2048/0x3306E88D27211E0B 2014-12-10 [E] <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> +uid [ full ] Roger Dingledine <arma#mit.edu> sub elg2048/0x147FF421788AFDCE 2000-02-27 [E] Key fingerprint = 08E6 A5BD CF81 D0A3 1BDE 9474 147F F421 788A FDCE -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> +uid [ultimate] Roger Dingledine <arma#mit.edu> +uid [ultimate] Roger Dingledine <arma#freehaven.net> +uid [ultimate] Roger Dingledine <arma#torproject.org> sub rsa4096/0x1A61312B4600E8BE 2018-06-03 [E] [expires: 2019-06-03] Key fingerprint = 6C8F F7D9 F789 52A1 8986 52B7 1A61 312B 4600 E8BE -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] +uid [ full ] Nick Mathewson <nickm#alum.mit.edu> +uid [ full ] Nick Mathewson <nickm#wangafu.net> +uid [ full ] Nick Mathewson <nickm#freehaven.net> +uid [ full ] [jpeg image of size 3369] sub rsa3072/0x910397D88D29319A 2004-07-03 [S] Key fingerprint = EF00 F369 1387 FCC5 8CD6 8E13 9103 97D8 8D29 319A sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] @@ -107,10 +91,10 @@ sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] 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] +uid [ full ] Nick Mathewson <nickm#alum.mit.edu> +uid [ full ] Nick Mathewson <nickm#wangafu.net> +uid [ full ] Nick Mathewson <nickm#freehaven.net> +uid [ full ] [jpeg image of size 3369] sub rsa3072/0x910397D88D29319A 2004-07-03 [S] Key fingerprint = EF00 F369 1387 FCC5 8CD6 8E13 9103 97D8 8D29 319A sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] @@ -119,16 +103,12 @@ 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] +uid [ full ] Nick Mathewson <nickm#alum.mit.edu> +uid [ full ] Nick Mathewson <nickm#wangafu.net> +uid [ full ] Nick Mathewson <nickm#freehaven.net> +uid [ full ] [jpeg image of size 3369] sub rsa3072/0x910397D88D29319A 2004-07-03 [S] Key fingerprint = EF00 F369 1387 FCC5 8CD6 8E13 9103 97D8 8D29 319A sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] @@ -136,10 +116,10 @@ sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] 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] +uid [ full ] Nick Mathewson <nickm#alum.mit.edu> +uid [ full ] Nick Mathewson <nickm#wangafu.net> +uid [ full ] Nick Mathewson <nickm#freehaven.net> +uid [ full ] [jpeg image of size 3369] sub rsa3072/0x910397D88D29319A 2004-07-03 [S] Key fingerprint = EF00 F369 1387 FCC5 8CD6 8E13 9103 97D8 8D29 319A sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] @@ -150,20 +130,16 @@ sub rsa3072/0xD2CA27F3F25B8E5E 2004-07-03 [E] <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 +uid [ full ] deb.torproject.org archive signing key sub rsa2048/0x74A941BA219EC810 2009-09-04 [S] [expires: 2020-11-23] Key fingerprint = 2265 EB4C B2BF 88D9 00AE 8D1B 74A9 41BA 219E C810 </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 [ undef ] Damian Johnson (www.atagar.com) <atagar1#gmail.com> uid [ unknown] Damian Johnson <atagar#torproject.org> sub rsa2048/0x888404C187F30690 2010-08-07 [S] Key fingerprint = 2AE2 24F5 C424 990A E520 6C85 8884 04C1 87F3 0690 @@ -175,8 +151,8 @@ sub elg2048/0x04F1B63D146276B2 2009-06-17 [E] <pre> pub rsa4096/0xDBB802B258ACD84F 2015-01-18 [C] [expires: 2020-01-11] Key fingerprint = A490 D0F4 D311 A415 3E2B B7CA DBB8 02B2 58AC D84F -uid [ unknown] Tails developers (offline long-term identity key) <tails#boum.org> -uid [ unknown] Tails developers <tails#boum.org> +uid [ full ] Tails developers (offline long-term identity key) <tails#boum.org> +uid [ full ] Tails developers <tails#boum.org> sub ed25519/0x90B2B4BD7AED235F 2017-08-28 [S] [expires: 2020-01-11] Key fingerprint = CD4D 4351 AFA6 933F 574A 9AFB 90B2 B4BD 7AED 235F sub rsa4096/0xD21DAD38AF281C0B 2017-08-28 [S] [expires: 2020-01-11] @@ -191,9 +167,9 @@ sub rsa4096/0xA8B0F4E45B1B50E2 2018-08-30 [S] [expires: 2020-01-11] <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> +uid [ full ] David Goulet <dgoulet#ev0ke.net> +uid [ full ] David Goulet <dgoulet#riseup.net> +uid [ full ] David Goulet <dgoulet#torproject.org> sub rsa4096/0x2AC6036C93CC198D 2013-09-10 [E] [expires: 2019-08-17] Key fingerprint = 0451 E51B 33B7 AC38 C57B 09F7 2AC6 036C 93CC 198D @@ -202,8 +178,8 @@ sub rsa4096/0x2AC6036C93CC198D 2013-09-10 [E] [expires: 2019-08-17] <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> +uid [ undef ] Sukhbir Singh <azadi#riseup.net> +uid [ undef ] Sukhbir Singh <sukhbir#torproject.org> sub rsa4096/0x1AF20C043D9F9289 2016-02-25 [E] [expires: 2020-02-24] Key fingerprint = 4403 733D 7141 9BF1 8617 4988 1AF2 0C04 3D9F 9289 @@ -212,9 +188,9 @@ sub rsa4096/0x1AF20C043D9F9289 2016-02-25 [E] [expires: 2020-02-24] <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> +uid [ full ] Peter Palfrader +uid [ full ] Peter Palfrader <weasel#debian.org> +uid [ full ] Peter Palfrader <peter#palfrader.org> sub rsa2048/0x8602C8203872331F 2014-05-04 [S] [expires: 2020-09-01] Key fingerprint = B383 D785 A8C9 2FDE BC06 0376 8602 C820 3872 331F sub rsa2048/0xE377AED938E4E080 2014-05-04 [E] [expires: 2020-09-01]

1 0

[webwml/staging] Remove donate banner
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 6ab91871aebee95801e4779b66ca4dadddc54197 Author: hiro <hiro(a)torproject.org> Date: Wed Jan 2 15:40:19 2019 +0100 Remove donate banner --- en/index.wml | 1 - es/index.wml | 1 - 2 files changed, 2 deletions(-) diff --git a/en/index.wml b/en/index.wml index 320ea85d..6434165e 100644 --- a/en/index.wml +++ b/en/index.wml @@ -41,7 +41,6 @@ # end WML to generate css/js paths </head> <body> -#include "banner.wmi" #include "head-index.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" <div id="home"> <div id="content" class="clearfix"> diff --git a/es/index.wml b/es/index.wml index 3c0fd50e..a9f2c5f4 100644 --- a/es/index.wml +++ b/es/index.wml @@ -41,7 +41,6 @@ # end WML to generate css/js paths </head> <body> -#include "banner.wmi" #include "head-index.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" <define-tag lang>es-ES</define-tag> <div id="home">

1 0

[webwml/staging] Update Isabela's people page description
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 6df0b21fb5a6566e38b74df51cb988caafa1663a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jan 4 09:34:19 2019 -0800 Update Isabela's people page description --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 6371973d..0d6cc5e9 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -391,7 +391,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=8F2AF9B6D4A14D03FDF1B298…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#isabela">Isabela Bagueros</a></div> <div class="field"><b>IRC:</b> isabela</div> - <div class="description">Coordinates Tor's development teams and roadmaps. Keeps track of priorities, and ensures Tor always thinks of the "user first".</div> + <div class="description">Executive Director of the Tor Project.</div> </td> </tr>

1 0

[webwml/staging] fix our physical address yet again
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit d2bf8fd59b6a998d10e3a9f470cab3526b838274 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Jan 3 16:42:19 2019 -0500 fix our physical address yet again (i did it the first time in commit 05b73e, but that got broken in commit e33a33. oops.) --- about/en/contact.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/contact.wml b/about/en/contact.wml index 7234f855..27613698 100644 --- a/about/en/contact.wml +++ b/about/en/contact.wml @@ -158,7 +158,7 @@ sub 4096R/C00942E4 2017-03-13 <p>Should you need to reach us via old-fashioned mail, our mailing address is:</p> <address>The Tor Project, Inc.<br> -P.O. Box 4903<br> +217 First Ave South #4903<br> Seattle, WA 98194 USA<br><br> </address>

1 0

[webwml/staging] Stable is 0.3.5.7; there is no alpha for the moment.
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 523e14fc1c4eaeadcf6f36decf8dc8dcffca1127 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 7 16:40:53 2019 -0500 Stable is 0.3.5.7; there is no alpha for the moment. --- Makefile | 4 ++-- include/versions.wmi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 8e121938..0c050ad4 100644 --- a/Makefile +++ b/Makefile @@ -14,8 +14,8 @@ # branch to your personal webwml repository, open a trac ticket in the # website component, and set it to needs_review. -export STABLETAG=tor-0.3.4.9 -export DEVTAG=tor-0.3.5.6-rc +export STABLETAG=tor-0.3.5.7 +export DEVTAG=tor-0.3.5.7 WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index b4b484d4..6e850301 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ -<define-tag version-stable whitespace=delete>0.3.4.9</define-tag> -<define-tag version-alpha whitespace=delete>0.3.5.6-rc</define-tag> +<define-tag version-stable whitespace=delete>0.3.5.7</define-tag> +<define-tag version-alpha whitespace=delete>0.3.5.7</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0

[webwml/staging] Change Matt's description to present tense
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 3923dd861a3f5b2426f3b666e743642f49f53a93 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 12 17:42:08 2019 -0800 Change Matt's description to present tense --- about/en/corepeople.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 0d6cc5e9..a473f561 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -591,7 +591,7 @@ <div class="icon"><a href="https://db.torproject.org/fetchkey.cgi?fingerprint=CE1782624600EE98764C6D9C…"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> <div class="name"><a href="#sysrqb">Matthew Finkel</a></div> <div class="field"><b>IRC:</b> sysrqb</div> - <div class="description">Worked on tor, torsocks, and many other projects. Helped maintain and develop BridgeDB.</div> + <div class="description">Works on tor, torsocks, and many other projects. Helps maintain and develop BridgeDB.</div> </td> <td>

1 0

[webwml/staging] Remove mozilla match in download page
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit ca1828e4a25f01613839e5258796a3cf592de556 Author: hiro <hiro(a)torproject.org> Date: Mon Jan 14 19:12:35 2019 +0100 Remove mozilla match in download page --- download/en/download-easy.wml | 2 -- 1 file changed, 2 deletions(-) diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml index 497405ba..489e7611 100644 --- a/download/en/download-easy.wml +++ b/download/en/download-easy.wml @@ -209,8 +209,6 @@ <div id="dow-don-right"> <a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a> -<p>Mozilla will match your <br /> -donation until 12/31!</p> </div>

1 0

[webwml/staging] press.pl: catch \r in csv, add debugging option
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 29641222a4cceb7d8c82f80704db194a9b4285fb Author: traumschule <traumschuleriebau(a)riseup.net> Date: Wed Dec 19 16:26:14 2018 -0500 press.pl: catch \r in csv, add debugging option --- press/press.pl | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/press/press.pl b/press/press.pl index 914edcee..e1e329db 100755 --- a/press/press.pl +++ b/press/press.pl @@ -6,38 +6,53 @@ use Time::Piece; #use HTML::Escape qw/escape_html/; my %pub; # save all publications +my $debug = 0; +sub debug { + my $msg = shift; + print "$msg\n" if $debug; +} sub parse_line { my $str = shift; + debug "Parsing:\n$str"; if ($str =~ /(\d+\/\d+\/\d+),([^,]+),(.+),(.+)/) { # magic regex :) my $time = Time::Piece->strptime($1, "%m/%d/%y"); # given format: MM/DD/YY my $date = $time->strftime("%Y %b %d"); chomp(my $source = $2); - $pub{$time->epoch} = "<tr>\n<td>$date</td>\n<td>$source</td>\n<td><a href='$4'>\n$3</a></td>\n</tr>\n\n"; + $pub{$time->epoch} .= "<tr>\n<td>$date</td>\n<td>$source</td>\n<td><a href='$4'>\n$3</a></td>\n</tr>\n\n"; + # TODO use uniqe keys to avoid .= + debug "Added: $pub{$time->epoch}" } } -unless (@ARGV) { print "Usage: $0 /path/to/csv/file > file\n"; exit 1; } +unless (@ARGV) { print "Usage: $0 [-d] /path/to/csv/file > file\n"; exit 1; } # parse all arguments (hopefully existing files) foreach my $arg (@ARGV) { chomp($arg); - if (-f $arg) { - # we are lucky, this looks like a file + debug "arg: $arg"; + if ($arg eq '-d') { + $debug++; + debug "Enabling debug output on request." + } elsif (-f "$arg") { + debug 'argument looks like a file.'; open my $fh, '<', $arg - or warn "Can't open '$arg': $!\n" and next; + or die "Can't open '$arg': $!\n"; + debug "Reading $arg."; foreach (<$fh>) { - parse_line $_; + # https://stackoverflow.com/questions/6373888/converting-newline-formatting-f… + foreach my $line (split '\r', $_) { + parse_line $line; + } } - close $fh; + close $fh; debug "Finished reading $arg." } else { - # this is no file, let's assume we got piped a string to parse + debug 'argument is no file, assuming piped string.'; parse_line $arg; } } -# share our treasure with the world my $str = join '', map { $pub{$_} } reverse sort keys %pub; -if ($str) { print $str; } +debug "Generated final html string (". (scalar keys %pub) ." entries):"; +if ($str) { print "$str\nAdd above to press/en/press.wml.\n"; } else { print "Nothing found.\n"; exit 1; } -# TODO one day i want to able to update press/en/press.wml directly

1 0

[webwml/staging] add press clips (#28900)
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 33f5ef2e87967f739a5dfab88f47390353976667 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Wed Dec 19 16:24:51 2018 -0500 add press clips (#28900) --- press/en/press.wml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index 717e0a8f..4a042c45 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -51,6 +51,27 @@ some of the significant Tor-related stories that have popped up.</p> </thead> <tr> +<td>2018 Dec 18</td> +<td>BoingBoing</td> +<td><a href='https://boingboing.net/2018/12/18/charitablegivinguide.html'> +Charitable Giving Guide 2018</a></td> +</tr> + +<tr> +<td>2018 Dec 10</td> +<td>ZDNet</td> +<td><a href='https://www.zdnet.com/article/half-of-the-tor-projects-funding-now-comes-fr…'> +Half of the Tor Project's funding now comes from the private sector</a></td> +</tr> + +<tr> +<td>2018 Dec 10</td> +<td>CyberScoop</td> +<td><a href='https://www.cyberscoop.com/tor-funding-isabela-bagueros-december-2018/'> +"With new director, Tor seeks new funding sources and international growth"</a></td> +</tr> + +<tr> <td>2018 Nov 02</td> <td>Motherboard</td> <td><a href='https://motherboard.vice.com/en_us/article/zm9jd4/old-school-sniffing-attac…'>

1 0

[webwml/staging] Add newest press clips (#28900)
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit dbd57010ed08d7fce13714b2697f6b09cd845063 Author: traumschule <traumschuleriebau(a)riseup.net> Date: Tue Jan 15 11:02:34 2019 -0500 Add newest press clips (#28900) --- press/en/press.wml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index 4a042c45..8463a550 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -51,6 +51,20 @@ some of the significant Tor-related stories that have popped up.</p> </thead> <tr> +<td>2019 Jan 11</td> +<td>TechCrunch</td> +<td><a href='https://techcrunch.com/2019/01/11/tor-lessens-reliance-us-grants/'> +Tor pulls in record donations as it lessens reliance on US government grants</a></td> +</tr> + +<tr> +<td>2019 Jan 01</td> +<td>Wired</td> +<td><a href='https://www.wired.com/story/tor-anonymity-easier-than-ever/'> +Tor Is Easier Than Ever. Time to Give It a Try</a></td> +</tr> + +<tr> <td>2018 Dec 18</td> <td>BoingBoing</td> <td><a href='https://boingboing.net/2018/12/18/charitablegivinguide.html'>

1 0