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

[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

[webwml/staging] this would be #69 in github
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

1 0