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

[webwml/staging] Add possibility to close banner
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit b805607470b9b11d8980b3688a287c0659a4c0ab Author: hiro <hiro(a)torproject.org> Date: Tue Nov 6 19:49:13 2018 +0100 Add possibility to close banner --- css/layout.css | 30 +++++++++++++ css/layout.min.css | 30 +++++++++++++ en/banner2.wmi | 4 +- en/index.wml | 42 +++++++++++++++++- include/head-index.wmi | 116 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 220 insertions(+), 2 deletions(-) diff --git a/css/layout.css b/css/layout.css index 3d6453c2..4b18d223 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1533,3 +1533,33 @@ mark { font-size-adjust: 0.7; line-height: 1.5em; } + +/* Checkbox Hack */ + +input[type=checkbox] { + position: absolute; + top: -9999px; + left: -9999px; +} + +label { + -webkit-appearance: push-button; + -moz-appearance: button; + display: inline-block; + cursor: pointer; + color: white; + float: right; + font-weight: bold; + padding-right: 5px; + padding-top: 5px; +} + +#eoy-banner { + visibility: visible; +} + +/* Toggled State */ +input[type=checkbox]:checked ~ div#eoy-banner { + visibility: hidden; + display: none; +} diff --git a/css/layout.min.css b/css/layout.min.css index 17969bb5..130283a0 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -132,3 +132,33 @@ mark { font-size-adjust: 0.7; line-height: 1.5em; } + +/* Checkbox Hack */ + +input[type=checkbox] { + position: absolute; + top: -9999px; + left: -9999px; +} + +label { + -webkit-appearance: push-button; + -moz-appearance: button; + display: inline-block; + cursor: pointer; + color: white; + float: right; + font-weight: bold; + padding-right: 5px; + padding-top: 5px; +} + +#eoy-banner { + visibility: visible; +} + +/* Toggled State */ +input[type=checkbox]:checked ~ div#eoy-banner { + visibility: hidden; + display: none; +} diff --git a/en/banner2.wmi b/en/banner2.wmi index 3504994b..d21cc17d 100644 --- a/en/banner2.wmi +++ b/en/banner2.wmi @@ -1,4 +1,6 @@ -<div class="eoy-background-2 align-center"> +<label for="toggle-1">x</label> +<input type="checkbox" id="toggle-1"> +<div id="eoy-banner" class="eoy-background-2 align-center"> <div class="eoy-wrap align-center"> <div class="eoy-message-2 align-center"> <div class="tor-strength-in-num green align-center"> diff --git a/en/index.wml b/en/index.wml index f99eeed5..73d1e6e0 100644 --- a/en/index.wml +++ b/en/index.wml @@ -1,8 +1,48 @@ ## translation metadata # Revision: $Revision$ # Translation-Priority: 1-high +<define-tag viewport whitespace=delete> +<meta name="viewport" content="width\=device-width, initial-scale=1"> +</define-tag> +<!DOCTYPE html> + <html> + <head> + + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <viewport> + <meta name="author" content="The Tor Project, Inc."> + <meta name="description" content="The Tor Project's free software protects your privacy online. Site blocked? Email [mailto:gettor@torproject.org] for help downloading Tor Browser."> + <meta name="keywords" content="tor, tor project, tor browser, avoid censorship, traffic analysis, anonymous communications, privacy, avoid surveillance, online security, anonymous online, private browsing, anonymity online, online privacy, protect privacy, private mac browser, private windows browser, private android browser, linux browser, anonymity network, tor network, onion router, onion browser"> + <meta property="og:image" content="https://www.torproject.org/images/tor-logo.jpg"> +{#meta#} + + <title>$(TITLE)</title> + + <link rel="icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/$(STYLESHEET)" rel="stylesheet">"> + <ifeq "$(STYLESHEET)" "" "<link href="$(DOCROOT)/css/master.min.css" rel="stylesheet">"> + + #<link href="css/master.min.css" rel="stylesheet"> +  +  +  + # <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths +</head> +<body> #include "banner2.wmi" -#include "head.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" +#include "head-index.wmi" TITLE="Tor Project | Privacy Online" CHARSET="UTF-8" <div id="home"> <div id="content" class="clearfix"> <div id="maincol"> diff --git a/include/head-index.wmi b/include/head-index.wmi new file mode 100644 index 00000000..e491a844 --- /dev/null +++ b/include/head-index.wmi @@ -0,0 +1,116 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + + +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + # navigation menu generation + <div id="nav"> + <ul> + <:{ + # create a hash and maintain order of keys + my %navigation; + my @keys; + while (@navigation) { + my $key = shift @navigation; + my $val = shift @navigation; + push @keys, $key; + $navigation{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory of active link, set class active. This rule should be improved with proper structuring of the links. + my $class; + if ((index($page, 'contact') ne -1) and (index($base, 'overview') ne -1)) { + $class = ''; + } elsif ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) and (index($key, 'contact') eq -1) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active '.$base.' '.$page.'"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + + # translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; + } + # english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to +docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + # end navigation generation + <div id="calltoaction"> + <ul> + <:{ + my %calltoaction; + my @keys; + while (@calltoaction) { + my $key = shift @calltoaction; + my $val = shift @calltoaction; + push @keys, $key; + $calltoaction{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory, set active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + #if ($WML_SRC_BASENAME eq $base) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + # try to use a translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; + } + # default to english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + </div> +  + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">

1 0

[webwml/staging] Update css for banner
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 8a3d7f046903dab0fb4a5018d11a097702ed0bf6 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 7 15:05:57 2018 +0100 Update css for banner --- css/layout.css | 7 ++++--- css/layout.min.css | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/css/layout.css b/css/layout.css index 4b18d223..db89f7c7 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1531,7 +1531,7 @@ mark { width: 100%; align-content: center; font-size-adjust: 0.7; - line-height: 1.5em; + line-height: 1.0em; } /* Checkbox Hack */ @@ -1550,8 +1550,9 @@ label { color: white; float: right; font-weight: bold; - padding-right: 5px; - padding-top: 5px; + padding-right: 15px; + padding-top: 15px; + font-size: 20px; } #eoy-banner { diff --git a/css/layout.min.css b/css/layout.min.css index 130283a0..eb48f1fb 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -130,7 +130,7 @@ mark { width: 100%; align-content: center; font-size-adjust: 0.7; - line-height: 1.5em; + line-height: 1.0em; } /* Checkbox Hack */ @@ -149,8 +149,9 @@ label { color: white; float: right; font-weight: bold; - padding-right: 5px; - padding-top: 5px; + padding-right: 15px; + padding-top: 15px; + font-size: 20px; } #eoy-banner {

1 0

[webwml/staging] Change title of metrics job post
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 82b2bb5c0b3cc5e0f49593c50050cb2b67be2281 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 12 14:14:14 2018 +0100 Change title of metrics job post --- about/en/jobs-metrics-data-architect.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/about/en/jobs-metrics-data-architect.wml b/about/en/jobs-metrics-data-architect.wml index ee94d104..59307f0d 100644 --- a/about/en/jobs-metrics-data-architect.wml +++ b/about/en/jobs-metrics-data-architect.wml @@ -1,4 +1,4 @@ -#include "head.wmi" TITLE="Tor Project: Jobs (software developer)" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor Project: Jobs (metrics data architect)" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a>

1 0

[webwml/staging] Add Hans-Christoph to the people page
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit e26dc351844c3008b244f781663f685987225cbe Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 7 11:50:46 2018 -0800 Add Hans-Christoph to the people page --- about/en/corepeople.wml | 134 +++++++++++++++++++++++++--------------------- images/people/hc.png | Bin 0 -> 38444 bytes images/people/orig/hc.jpg | Bin 0 -> 149652 bytes 3 files changed, 72 insertions(+), 62 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index b35e614b..1739cc85 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -311,6 +311,16 @@ <tr> <td> + <a id="hc"></a> + <div class="photo"><img src="$(IMGROOT)/people/hc.png" alt="hc" /></div> + <div class="icon"><a href="https://twitter.com/hansstatus"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> + <div class="icon"><a href="https://pgp.mit.edu/pks/lookup?op=vindex&search=0xE9E28DEA00AA5556"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> + <div class="name"><a href="#hc">Hans-Christoph Steiner</a></div> + <div class="field"><b>IRC:</b> _hc</div> + <div class="description">Works on Orbot, NetCipher, and integrating Tor everywhere possible, especially in Debian and Android. Also deeply mixed into Guardian Project.</div> + </td> + + <td> <a id="nyinz"></a> <div class="photo"><img src="$(IMGROOT)/people/nyinz.png" alt="nyinz" /></div> <div class="icon"><a href="../keys/nyinz.txt"><img src="$(IMGROOT)/pgp-key.png" alt="pgp key" /></a></div> @@ -318,7 +328,9 @@ <div class="field"><b>IRC:</b> nyinz</div> <div class="description">I am very excited and honored to contribute to the Tor project on its mission to provide usable technologies to the global south.</div> </td> + </tr> + <tr> <td> <a id="irl"></a> <div class="photo"><img src="$(IMGROOT)/people/irl.png" alt="irl" /></div> @@ -329,9 +341,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://metrics.torproject.org">Metrics team member</a> and maintainer of <a href="https://metrics.torproject.org/rs.html">Relay Search</a>.</div> </td> - </tr> - <tr> <td> <a id="ian"></a> <div class="photo"><img src="$(IMGROOT)/people/ian.png" alt="ian" /></div> @@ -340,7 +350,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://cs.uwaterloo.ca/~iang/">Professor of CS</a> at the <a href="https://uwaterloo.ca/">University of Waterloo</a>, developing <a href="https://otr.cypherpunks.ca/">Off-the-Record Messaging</a> among other things.</div> </td> + </tr> + <tr> <td> <a id="igt0"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -350,9 +362,7 @@ <div class="field"><b>IRC:</b> igt0</div> <div class="description">Works on Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="intrigeri"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -361,7 +371,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">He is one of our main interfaces with the <a href="https://tails.boum.org/">Tails</a> project.</div> </td> + </tr> + <tr> <td> <a id="isabela"></a> <div class="photo"><img src="$(IMGROOT)/people/isabela.png" alt="isabela" /></div> @@ -371,9 +383,7 @@ <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> </td> - </tr> - <tr> <td> <a id="ilv"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -381,7 +391,9 @@ <div class="name"><a href="#ilv">isra</a></div> <div class="description">Rewrote the <a href="https://gettor.torproject.org">GetTor</a> service.</div> </td> + </tr> + <tr> <td> <a id="redshiftzero"></a> <div class="photo"><img src="$(IMGROOT)/people/redshiftzero.png" alt="redshiftzero" /></div> @@ -391,9 +403,7 @@ <div class="field"><b>IRC:</b> redshiftzero</div> <div class="description">Lead developer of the <a href="https://securedrop.org/">SecureDrop</a> whistleblower platform based at the <a href="https://freedom.press/">Freedom of the Press Foundation</a>.</div> </td> - </tr> - <tr> <td> <a id="qbi"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -403,7 +413,9 @@ <div class="field"><b>IRC:</b> qbi</div> <div class="description">Volunteer that helped translate the website, is part of TorServers.net, and Tor's sysadmin team.</div> </td> + </tr> + <tr> <td> <a id="jselon"></a> <div class="photo"><img src="$(IMGROOT)/people/jselon.png" alt="jselon" /></div> @@ -412,9 +424,7 @@ <div class="field"><b>IRC:</b> jselon</div> <div class="description">Event Coordination, donor management, general office operations.</div> </td> - </tr> - <tr> <td> <a id="juga"></a> <div class="photo"><img src="$(IMGROOT)/people/juga.png" alt="juga" /></div> @@ -423,7 +433,9 @@ <div class="field"><b>IRC:</b> juga</div> <div class="description">Contributed to OONI, bug tracker features, wrote tordyguards. Currently working on bandwidth scanner.</div> </td> + </tr> + <tr> <td> <a id="julius"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -432,9 +444,7 @@ <div class="name"><a href="#julius">Julius Mittenzwei</a></div> <div class="description">Germany-based lawyer and Internet activist.</div> </td> - </tr> - <tr> <td> <a id="juris"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -443,7 +453,9 @@ <div class="field"><b>IRC:</b> juris</div> <div class="description">Board member of torservers.net.</div> </td> + </tr> + <tr> <td> <a id="karsten"></a> <div class="photo"><img src="$(IMGROOT)/people/karsten.png" alt="karsten" /></div> @@ -453,9 +465,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Primary researcher and developer into <a href="https://metrics.torproject.org/">anonymous metrics</a> which started as a National Science Foundation grant.</div> </td> - </tr> - <tr> <td> <a id="kat5"></a> <div class="photo"><img src="$(IMGROOT)/people/kat5.png" alt="kat5" /></div> @@ -465,7 +475,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Volunteer on the Community Team. Helps with t-shirts for relay operators and other odds and ends.</div> </td> + </tr> + <tr> <td> <a id="ailanthus"></a> <div class="photo"><img src="$(IMGROOT)/people/ailanthus.png" alt="ailanthus" /></div> @@ -475,9 +487,7 @@ <div class="field"><b>IRC:</b> ailanthus</div> <div class="description">Writes about Tor in mainstream and technical publications and conducts community workshops to teach people about Tor.</div> </td> - </tr> - <tr> <td> <a id="kushal"></a> <div class="photo"><img src="$(IMGROOT)/people/kushal.png" alt="kushal" /></div> @@ -488,16 +498,16 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://securedrop.org">SecureDrop</a> developer at the <a href="https://freedom.press">Freedom of Press Foundation</a>. Member of the community team, privacy advocate focusing on new users.</div> </td> + </tr> + <tr> <td> <a id="leif"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#leif">Leif Ryge</a></div> <div class="description">Works on security analysis, designer of "bananaphone" transport.</div> </td> - </tr> - <tr> <td> <a id="ln5"></a> <div class="photo"><img src="$(IMGROOT)/people/ln5.png" alt="ln5" /></div> @@ -507,7 +517,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Software developer, sysadmin and co-founder of the Swedish Torservers.net partner :DFRI. Member of the sysadmin team. Runs one of the directory authorities.</a></div> </td> + </tr> + <tr> <td> <a id="wayward"></a> <div class="photo"><img src="$(IMGROOT)/people/wayward.png" alt="wayward" /></div> @@ -517,9 +529,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Community team, user advocate, and Mozilla fellow.</div> </td> - </tr> - <tr> <td> <a id="agrabeli"></a> <div class="photo"><img src="$(IMGROOT)/people/agrabeli.png" alt="agrabeli" /></div> @@ -530,7 +540,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world.</div> </td> + </tr> + <tr> <td> <a id="mcs"></a> <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div> @@ -540,9 +552,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Developer on the Tor Browser team.</div> </td> - </tr> - <tr> <td> <a id="matt"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -550,7 +560,9 @@ <div class="name"><a href="#matt">Matt Blaze</a></div> <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div> </td> + </tr> + <tr> <td> <a id="pastly"></a> <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div> @@ -559,9 +571,7 @@ <div class="field"><b>IRC:</b> pastly</div> <div class="description">Matt <a href="http://mattttttssi4lhud.onion/">implemented</a> the <a href="http://www.robgjansen.com/publications/kist-sec2014.pdf">KIST scheduler</a> into Tor. He helps safely measure Tor and says helpful things on IRC.</div> </td> - </tr> - <tr> <td> <a id="sysrqb"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -571,7 +581,9 @@ <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> </td> + </tr> + <tr> <td> <a id="meejah"></a> <div class="photo"><img src="$(IMGROOT)/people/meejah.png" alt="meejah" /></div> @@ -581,9 +593,7 @@ <div class="field"><b>IRC:</b> meejah</div> <div class="description"><a href="https://meejah.ca">Author</a> of <a href="https://github.com/meejah/txtorcon">txtorcon</a>, <a href="https://github.com/meejah/carml">carml</a> and other Tor Python tools including some for bad-relay hunting.</div> </td> - </tr> - <tr> <td> <a id="micahflee"></a> <div class="photo"><img src="$(IMGROOT)/people/micahflee.png" alt="micahflee" /></div> @@ -592,7 +602,9 @@ <div class="name"><a href="#micahflee">Micah Lee</a></div> <div class="description">Developer of <a href="https://github.com/micahflee/onionshare">OnionShare</a> and <a href="https://github.com/micahflee/torbrowser-launcher">Tor Browser Launcher</a> journalist and security engineer at <a href="https://theintercept.com/staff/micah-lee/">The Intercept</a> and advocate for <a href="https://freedom.press/">freedom of the press</a>.</div> </td> + </tr> + <tr> <td> <a id="mtigas"></a> <div class="photo"><img src="$(IMGROOT)/people/mtigas.png" alt="mtigas" /></div> @@ -602,9 +614,7 @@ <div class="field"><b>IRC:</b> mtigas</div> <div class="description">Works on <a href="https://mike.tig.as/onionbrowser/">Onion Browser</a>, iOS, and hacker-journalist at <a href="https://www.propublica.org/">ProPublica</a> running their <a href="https://www.propub3r6espa33w.onion/">onion service</a>.</div> </td> - </tr> - <tr> <td> <a id="moritz"></a> <div class="photo"><img src="$(IMGROOT)/people/moritz.png" alt="moritz" /></div> @@ -613,7 +623,9 @@ <div class="name"><a href="#moritz">Moritz Bartl</a></div> <div class="description">Co-founder of <a href="https://www.torservers.net/">torservers.net</a>, a network of non-profit organizations that run Tor exit relays.</div> </td> + </tr> + <tr> <td> <a id="n8fr8"></a> <div class="photo"><img src="$(IMGROOT)/people/n8fr8.png" alt="n8fr8" /></div> @@ -622,9 +634,7 @@ <div class="field"><b>IRC:</b> n8fr8</div> <div class="description">Founder of the <a href="https://guardianproject.info/">Guardian Project</a>. Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK. Director of Technology at Tibet Action Institute.</div> </td> - </tr> - <tr> <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> @@ -633,7 +643,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> + </tr> + <tr> <td> <a id="nickm"></a> <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div> @@ -644,9 +656,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> - </tr> - <tr> <td> <a id="boklm"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -656,7 +666,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="mrphs"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -666,9 +678,7 @@ <div class="field"><b>IRC:</b> mrphs</div> <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> </td> - </tr> - <tr> <td> <a id="pari"></a> <div class="photo"><img src="$(IMGROOT)/people/pari.png" alt="pari" /></div> @@ -678,7 +688,9 @@ <div class="field"><b>IRC:</b> pari</div> <div class="description">Works with UX and Community teams, and on Tor India initiatives. Started as an Outreachy intern.</div> </td> + </tr> + <tr> <td> <a id="syverson"></a> <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div> @@ -686,9 +698,7 @@ <div class="field"><b>IRC:</b> syverson</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div> </td> - </tr> - <tr> <td> <a id="pepijn"></a> <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div> @@ -697,16 +707,16 @@ <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div> <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div> </td> + </tr> + <tr> <td> <a id="peter"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#peter">Peter Palfrader</a></div> <div class="description">Manages the Debian packages, runs one of the directory authorities, and generally helps out a lot.</div> </td> - </tr> - <tr> <td> <a id="phw"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -716,7 +726,9 @@ <div class="field"><b>IRC:</b> phw</div> <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div> </td> + </tr> + <tr> <td> <a id="pili"></a> <div class="photo"><img src="$(IMGROOT)/people/pili.png" alt="pili" /></div> @@ -727,9 +739,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Project Manager for the Tor Browser, Community and UX teams.</div> </td> - </tr> - <tr> <td> <a id="robt"></a> <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div> @@ -737,7 +747,9 @@ <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div> <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div> </td> + </tr> + <tr> <td> <a id="ramy"></a> <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div> @@ -746,9 +758,7 @@ <div class="name"><a href="#ramy">Ramy Raoof</a></div> <div class="description">Tor Board member, technologist, and privacy and security researcher.</div> </td> - </tr> - <tr> <td> <a id="pospeselr"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -758,7 +768,9 @@ <div class="field"><b>IRC:</b> pospeselr</div> <div class="description">Tor Browser developer.</div> </td> + </tr> + <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -768,9 +780,7 @@ <div class="field"><b>IRC:</b> robgjansen</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div> </td> - </tr> - <tr> <td> <a id="arma"></a> <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div> @@ -780,7 +790,9 @@ <div class="field"><b>IRC:</b> arma</div> <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div> </td> + </tr> + <tr> <td> <a id="sajolida"></a> <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div> @@ -789,9 +801,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Technical writing, UX, and fundraising for Tails.</div> </td> - </tr> - <tr> <td> <a id="sstevenson"></a> <div class="photo"><img src="$(IMGROOT)/people/sstevenson.png" alt="sstevenson" /></div> @@ -799,7 +809,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Directs and coordinates all fundraising activities.</div> </td> + </tr> + <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -807,9 +819,7 @@ <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> - </tr> - <tr> <td> <a id="sisbell"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -819,7 +829,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser for Android.</div> </td> + </tr> + <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -830,9 +842,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> - </tr> - <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -842,7 +852,9 @@ <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> + </tr> + <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -852,9 +864,7 @@ <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> - </tr> - <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -865,7 +875,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Directs communications.</div> </td> + </tr> + <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -875,9 +887,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href=""http://murdoch.is/"">Principal Research Fellow</a> at University College London. He is the original creator of the <a href=""https://www.torproject.org/projects/torbrowser.html.en"">Tor Browser</a>.</div> </td> - </tr> - <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -886,7 +896,9 @@ <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Member of the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> + </tr> + <tr> <td> <a id="haxxpop"></a> <div class="photo"><img src="$(IMGROOT)/people/haxxpop.png" alt="haxxpop" /></div> @@ -896,9 +908,7 @@ <div class="field"><b>IRC:</b> haxxpop</div> <div class="description">Contributes to core Tor and especially onion services.</div> </td> - </tr> - <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -909,7 +919,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> + </tr> + <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -919,9 +931,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Tor developer and chutney maintainer. Currently working on onion services, directory documents, and statistics.</div> </td> - </tr> - <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -932,7 +942,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> + </tr> + <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> @@ -942,9 +954,7 @@ <div class="field"><b>IRC:</b> t0mmy</div> <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> </td> - </tr> - <tr> <td> <a id="egypcio"></a> <div class="photo"><img src="$(IMGROOT)/people/egypcio.png" alt="egypcio" /></div> @@ -954,7 +964,9 @@ <div class="field"><b>IRC:</b> egypcio</div> <div class="description">TorBSD Diversity Project (TDP); IPv6 Enthusiast, BSD Systems Evangelist, and Bridges/Relays Operator.</div> </td> + </tr> + <tr> <td> <a id="wseltzer"></a> <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div> @@ -965,9 +977,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> - </tr> - <tr> <td> <a id="yawning"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> diff --git a/images/people/hc.png b/images/people/hc.png new file mode 100644 index 00000000..8721c287 Binary files /dev/null and b/images/people/hc.png differ diff --git a/images/people/orig/hc.jpg b/images/people/orig/hc.jpg new file mode 100644 index 00000000..68eccd4a Binary files /dev/null and b/images/people/orig/hc.jpg differ

1 0

[webwml/staging] Redirect support to support.tp.o
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 5d6789701cecca63518bfa481c974b86f7e6b54f Author: hiro <hiro(a)torproject.org> Date: Mon Nov 12 23:14:59 2018 +0100 Redirect support to support.tp.o --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index c1f0557c..02d80f25 100644 --- a/.htaccess +++ b/.htaccess @@ -48,7 +48,7 @@ RewriteRule ^research(.*) https://research.torproject.org/ [R=301,L] RewriteRule ^getinvolved/research(.*) https://research.torproject.org/ [R=301,L] # Support -RewriteRule ^support(.*) https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam/Suppo… [R=301,L] +RewriteRule ^support(.*) https://support.torproject.org [R=301,L] # Newsletter RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L]

1 0

[webwml/staging] 0.3.5.4-alpha is released
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 51ec2607ab0d58e8c5ab949738a9f70e8c670d85 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 8 08:11:21 2018 -0500 0.3.5.4-alpha is released --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7bb787d6..0837ffbc 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.4.9 -export DEVTAG=tor-0.3.5.3-alpha +export DEVTAG=tor-0.3.5.4-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 154041f6..74d4f3e9 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.3-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.3.5.4-alpha</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0

[webwml/staging] Merge branch 'press'
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 0e1dd7fb89a5e6ea435de07f4e9f74b6fb508011 Merge: cbced75a 5d678970 Author: hiro <hiro(a)torproject.org> Date: Thu Nov 15 17:49:45 2018 +0100 Merge branch 'press' press/en/press.wml | 1789 +++++++++++++++++++++++++++++++--------------------- press/press.pl | 46 +- 2 files changed, 1088 insertions(+), 747 deletions(-)

1 0

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

15 Jan '19

commit 872cba433351de5e5ad876f929773f5ad77471a9 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 12 22:54:41 2018 +0100 Switch fundraising banner --- css/layout.css | 4 ++++ css/layout.min.css | 4 ++++ en/banner.wmi | 2 ++ en/index.wml | 2 +- es/banner.wmi | 2 ++ es/index.wml | 2 +- 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/css/layout.css b/css/layout.css index db89f7c7..16cd3ef7 100644 --- a/css/layout.css +++ b/css/layout.css @@ -1564,3 +1564,7 @@ input[type=checkbox]:checked ~ div#eoy-banner { visibility: hidden; display: none; } + +.black { + color: black; +} diff --git a/css/layout.min.css b/css/layout.min.css index eb48f1fb..4a4d8f65 100644 --- a/css/layout.min.css +++ b/css/layout.min.css @@ -163,3 +163,7 @@ input[type=checkbox]:checked ~ div#eoy-banner { visibility: hidden; display: none; } + +.black { + color: black; +} diff --git a/en/banner.wmi b/en/banner.wmi index 35c13e7c..b11c8eab 100644 --- a/en/banner.wmi +++ b/en/banner.wmi @@ -1,3 +1,5 @@ +<label class="black" for="toggle-1">x</label> +<input type="checkbox" id="toggle-1"> <div class="eoy-background"> <div class="eoy-wrap"> <div class="eoy-artwork"> diff --git a/en/index.wml b/en/index.wml index 73d1e6e0..320ea85d 100644 --- a/en/index.wml +++ b/en/index.wml @@ -41,7 +41,7 @@ # end WML to generate css/js paths </head> <body> -#include "banner2.wmi" +#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/banner.wmi b/es/banner.wmi index bb914cc8..047acbfd 100644 --- a/es/banner.wmi +++ b/es/banner.wmi @@ -1,3 +1,5 @@ +<label class="black" for="toggle-1">x</label> +<input type="checkbox" id="toggle-1"> <div class="eoy-background"> <div class="eoy-wrap"> <div class="eoy-artwork"> diff --git a/es/index.wml b/es/index.wml index af65d7f0..3c0fd50e 100644 --- a/es/index.wml +++ b/es/index.wml @@ -41,7 +41,7 @@ # end WML to generate css/js paths </head> <body> -#include "banner2.wmi" +#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] get our sponsors list back up to date
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit 11360eed2d29490bdfd9aae12a90e7064ca12a7f Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Nov 29 02:24:38 2018 -0500 get our sponsors list back up to date --- about/en/sponsors.wml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml index 7a9af36a..ae4eca1c 100644 --- a/about/en/sponsors.wml +++ b/about/en/sponsors.wml @@ -29,14 +29,17 @@ <li><a href="https://rosefdn.org/">Rose Foundation for Communities and the Environment</a> (2017-2018)</li> <li><a href="https://www.mozilla.org/en-US/moss/">Mozilla</a> (2016-2018)</li> <li><a href="https://www.opentech.fund/">Open Technology Fund</a> (2012-2018)</li> + <li><a href="https://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-2013, 2017-2020)</li> <li><a href="http://mediademocracyfund.org/">Media Democracy Fund</a> (2016-2018)</li> + <li><a href="https://handshake.org/">The Handshake Foundation</a> (2018)</li> <li><a href="https://nsf.gov/">National Science Foundation</a> joint with Princeton University (2012-2018)</li> <li><a href="https://nsf.gov/">National Science Foundation</a> via University of Minnesota (2013-2018)</li> <li><a href="https://nsf.gov/">National Science Foundation</a> joint with Georgetown (2015-2019)</li> <li><a href="https://nsf.gov/">National Science Foundation</a> joint with Rochester Institute of Technology (2016-2019)</li> <li><a href="https://nsf.gov/">National Science Foundation</a> joint with University of Illinois at Chicago (2016-2018)</li> <li><a href="https://www.fastly.com/">Fastly</a> (2016-2018)</li> - <li><a href="https://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2018)</li> + <li><a href="https://www.state.gov/j/drl/">US Department of State Bureau of Democracy, Human Rights, and Labor</a> (2013-2019)</li> + <li><a href="https://www.darpa.mil/program/extreme-ddos-defense">DARPA</a> via University of Pennsylvania (2018-2019)</li> <li><a href="https://www.team-cymru.org/">Team Cymru</a> (2009-present)</li> </ul> @@ -53,7 +56,6 @@ <li><a href="https://disconnect.me/">Disconnect</a> (2014)</li> <li><a href="https://freedom.press/">Freedom of the Press Foundation</a> (2014)</li> <li><a href="http://www.knightfoundation.org/">The Knight Foundation</a> (2012-2013)</li> - <li><a href="http://www.sida.se/English/">Sida - Swedish International Development Cooperation Agency</a> (2010-2013)</li> <li>An anonymous North American NGO (2008-2013)</li> <li><a href="http://www.bbg.gov/">Broadcasting Board of Governors</a> (2006-2013)</li> <li><a href="http://nsf.gov/">National Science Foundation</a> via Drexel University (2009-2011)</li>

1 0

[webwml/staging] 0.3.5.5-alpha is released
by emmapeel＠torproject.org 15 Jan '19

15 Jan '19

commit eed4d777a08d2e3560fbdd1ddfc094acb64ec5ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Nov 16 11:16:56 2018 -0500 0.3.5.5-alpha is released --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0837ffbc..39530f4b 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.4.9 -export DEVTAG=tor-0.3.5.4-alpha +export DEVTAG=tor-0.3.5.5-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 74d4f3e9..3f9003e7 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.4-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.3.5.5-alpha</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0