[tor-commits] [webwml/master] Minors changes on the text. Replaced autoresponder by robot. Fixed length of links.

2015-02-10 Thread sebastian
commit 341f6034fbbe6c831c39aee42058187731156ed0
Author: ileiva ile...@users.noreply.github.com
Date:   Sun Feb 8 16:45:00 2015 -0300

Minors changes on the text. Replaced autoresponder by robot. Fixed length 
of links.
---
 projects/en/gettor.wml |   38 ++
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml
index 0bf1854..d7b0d3b 100644
--- a/projects/en/gettor.wml
+++ b/projects/en/gettor.wml
@@ -2,7 +2,7 @@
 # Revision: $Revision$
 # Translation-Priority: 3-low
 
-#include head.wmi TITLE=Tor Project: GetTor autoresponder CHARSET=UTF-8
+#include head.wmi TITLE=Tor Project: GetTor robot CHARSET=UTF-8
 div id=content class=clearfix
div id=breadcrumbs
 a href=page indexHome raquo; /a
@@ -11,20 +11,21 @@
   /div
div id=maincol 
 
-h1GetTor autoresponder/h1
-pGetTor is a program that presents alternative methods to download Tor
-Browser, specially when access to Tor Project's official website and mirrors
-is blocked. For now, the only available method is SMTP (email)./p
+h1GetTor robot/h1
+pGetTor is a service that provides alternative methods to download Tor
+Browser, specially for situations where access to Tor Project's official
+website and mirrors is blocked. For now, the only available method is
+SMTP (email)./p
 
 h2Download Tor Browser via email/h2
 
 pUsers can communicate with GetTor robot by sending messages via email. 
-Currently, the best known GetTor email address is gettor @ torproject.org. 
-This should be the most current stable GetTor robot as it is operated by 
-Tor Project./p
+Currently, the best known email address to do this is get...@torproject.org.
+This should be the most current and stable GetTor robot as it is operated
+by Tor Project itself./p
 
-pTo ask for Tor Browser a user should send an email to GetTor robot with 
-one of the following options in the message body:/p
+pTo ask for Tor Browser, a user should send an email to GetTor robot with 
+one of the following options in the body of the message:/p
 
 ul
listrongwindows/strong: If the user needs Tor Browser for Windows.
@@ -35,11 +36,11 @@ one of the following options in the message body:/p
/li
 /ul
 
-pOptions are case insensitive. If a user select two or more options, only 
+pOptions are case insensitive. If a user selects two or more options, only 
 the first one will be considered. After the user sends a valid option, GetTor 
 robot will reply with links to download Tor Browser from popular cloud 
 services. For now, the only cloud service supported is Dropbox. A sample 
-reply from GetTor robot should look like this:/p
+reply from GetTor robot should look similar to this:/p
 
 pre
Thank you for your request for windows-en.
@@ -52,9 +53,14 @@ reply from GetTor robot should look like this:/p
 
Dropbox
 
-   Package (32/64-bit): 
https://www.dropbox.com/s/0p4oew8w2u7vzv2/torbrowser-install-4.0.1_en-US.exe?dl=1
-   ASC signature (32/64-bit): 
https://www.dropbox.com/s/y68hhrk378lygn4/torbrowser-install-4.0.1_en-US.exe.asc?dl=1
-   Package SHA256 checksum (32/64-bit): 
e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10
+   Package (32/64-bit):
+   https://www.dropbox.com/s/0p4oew8w/torbrowser-install-4.0.1_en-US.exe?dl=1
+
+   ASC signature (32/64-bit):
+   https://www.dropbox.com/s/y68h/torbrowser-install-4.0.1_en-US.exe.asc?dl=1
+
+   Package SHA256 checksum (32/64-bit):
+   e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10
 
Fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
 
@@ -105,7 +111,7 @@ install instructions/a to start using Tor Browser. A user 
that can't
 reach the Tor network after the install process should consider using
 a href=https://bridges.torproject.org;bridges/a or
 a href=https://www.torproject.org/docs/pluggable-transports.html.en;
-pluggable transports/a. This guide will be provided by the GetTor
+pluggable transports/a. These guides will be provided by the GetTor
 robot in the future.
 /p
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Remove duplicated mission statement from become-sponsor

2015-02-10 Thread sebastian
commit 18965ae70eb6b896c4b08bcc9602d61f52cf6c5d
Author: Sebastian Hahn sebast...@torproject.org
Date:   Mon Feb 9 05:45:25 2015 +0100

Remove duplicated mission statement from become-sponsor
---
 donate/en/become-sponsor.wml |   13 -
 1 file changed, 13 deletions(-)

diff --git a/donate/en/become-sponsor.wml b/donate/en/become-sponsor.wml
index 888a12a..1d1bb18 100644
--- a/donate/en/become-sponsor.wml
+++ b/donate/en/become-sponsor.wml
@@ -23,19 +23,6 @@ through various a href=page 
about/sponsorssponsors/a.  Our
 a href=https://trac.torproject.org/projects/tor/wiki/org/sponsors;current 
list of projects/a is available.
 Please join us to further online anonymity!/p
 !-- bad sales pitch end --
-!-- mission statement start --
-h2Tor's Mission Statement is:/h2
-piThe Corporation is organized and shall be operated exclusively for
-scientific, charitable and educational purposes within the meaning
-of section 501(c)(3) of the Internal Revenue Code, including (a)
-to develop, improve and distribute free, publicly available tools
-and programs that promote free speech, free expression, civic
-engagement and privacy rights online; (b) to conduct scientific
-research regarding, and to promote the use of and knowledge about,
-such tools, programs and related issues around the world; (c) to
-educate the general public around the world about privacy rights
-and anonymity issues connected to Internet use./i/p
-!-- mission statement end --
   /div
   !-- END MAINCOL --
   div id = sidecol



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Nobody wants irix or mac os x 10.2 systems

2015-02-10 Thread sebastian
commit 0e965dd5b3d93a40592af34fc09953e6c612e7fd
Author: Sebastian Hahn sebast...@torproject.org
Date:   Mon Feb 9 05:54:11 2015 +0100

Nobody wants irix or mac os x 10.2 systems
---
 donate/en/donate-hardware.wml |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/donate/en/donate-hardware.wml b/donate/en/donate-hardware.wml
index e605dd2..6dbe35d 100644
--- a/donate/en/donate-hardware.wml
+++ b/donate/en/donate-hardware.wml
@@ -14,10 +14,9 @@
 that could be used to provide the infrastructure that supports
 Tor's operations, including website mirrors, database servers, build
 systems and legacy hardware for supporting packages on older Operating
-Systems; such as OS X 10.2, OS X 10.3, Windows XP, Windows 7, IRIX,
-Redhat, CentOS, Fedora, Debian, etc. A number of service providers
-have an abundance of bandwidth capacity, but need hardware in order
-to donate it to us./p
+Systems; Windows 7, Redhat, CentOS, Fedora, Debian, etc. A number of
+service providers have an abundance of bandwidth capacity, but need
+hardware in order to donate it to us./p
 
 pBy donating hardware, you're joining our many a href=page
 about/sponsorssponsors/a in providing online privacy and anonymity. If



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] add hivos into our 2015 sponsors list too

2015-02-10 Thread sebastian
commit 7d787e46e100a1d6abb6ca0d618a6c1f31036396
Author: Roger Dingledine a...@torproject.org
Date:   Mon Feb 9 05:50:26 2015 -0500

add hivos into our 2015 sponsors list too
---
 about/en/sponsors.wml |1 +
 1 file changed, 1 insertion(+)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index 1c77eb5..b0c268a 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -28,6 +28,7 @@
  lia href=http://www.rfa.org/english/;Radio Free Asia/a 
(2012-2014)/li
  lia href=http://nsf.gov/;National Science Foundation/a joint 
with Georgia Tech and Princeton University (2012-2016)/li
  lia href=http://nsf.gov/;National Science Foundation/a via 
University of Minnesota (2013-2017)/li
+ lia href=https://digitaldefenders.org/;Hivos/The Digital 
Defenders Partnership/a (2014-2015)/li
  lia href=http://www.sri.com/;SRI International/a 
(2011-2015)/li
  lia href=http://www.state.gov/j/drl/;US Department of State 
Bureau of Democracy, Human Rights, and Labor/a (2013-2016)/li
  liAn anonymous North American ISP (2009-present)/li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Drop mentors who've been unresponsive

2015-02-10 Thread sebastian
commit e5162adafd00d6f1c362ab5e664ffd08d52a89ba
Author: Damian Johnson ata...@torproject.org
Date:   Sun Feb 8 10:24:02 2015 -0800

Drop mentors who've been unresponsive

Dropping Nick, Aaron, Mike, Nicolas, Steven, George, and Isis as prospective
mentors and in a couple cases where they were the only people dropping their
projects. We can add them back if they voice an interest in mentoring.
---
 getinvolved/en/volunteer.wml |   30 ++
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 00500fa..92bf903 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -735,11 +735,6 @@ meetings around the world./li
 in. This was actively developed until Fall of 2010.
 /p
 
-p
-bProject Ideas:/bbr /
-ia href=#newBridgedbDistributorNew BridgeDB Distributor/a/i
-/p
-
 a id=project-ooni-probe/a
 h3a href=https://ooni.torproject.org/;Ooni Probe/a (a
 href=https://gitweb.torproject.org/ooni-probe.git;code/a, a
@@ -930,7 +925,7 @@ meetings around the world./li
 br
 Skill Level: iMedium to High/i
 br
-Likely Mentors: iNick (nickm), David (dgoulet)/i
+Likely Mentors: iDavid (dgoulet)/i
 p
 The Tor code is more than 10 years old in places, and we haven't always had
 enough time or wisdom to write things as well as we could have.  Our unit
@@ -973,7 +968,7 @@ meetings around the world./li
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iSteven (sjmurdoch), Ximin (infinity0), George (asn)/i
+Likely Mentors: iXimin (infinity0)/i
 p
 For Tor users in censored countries, we have a a
 href=page docs/pluggable-transports
@@ -1044,7 +1039,7 @@ meetings around the world./li
 br
 Skill Level: iHigh/i
 br
-Likely Mentors: iSteven (sjmurdoch), Yawning/i
+Likely Mentors: iYawning/i
 p
 There are a
 
href=https://research.torproject.org/techreports/datagram-comparison-2011-11-07.pdf;lots
@@ -1182,7 +1177,7 @@ You may contact the mentors on IRC for more information. 
(sukhe on #tor-dev, #to
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iArturo (hellais), Aaron (aagbsn)/i
+Likely Mentors: iArturo (hellais)/i
 p
 The feature should also add support for including only packet capture data that
 is relevant to the test being run. This means that the pcap should not contain
@@ -1257,7 +1252,7 @@ configurations is a good first step to understanding this 
problem.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm), David (dgoulet)/i
+Likely Mentors: iDavid (dgoulet)/i
 p
 Right now, our unit test coverage with the tests we ship is around 30%
 -- only 30% of the executable lines in our source are reached by the
@@ -1323,7 +1318,7 @@ easy to test.)
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm), David (dgoulet)/i
+Likely Mentors: iDavid (dgoulet)/i
 p
 Right now, if you run a busy Tor server on a multicore computer, most of
 the cores are mostly unused.  We have a cpuworker mechanism to move
@@ -1373,7 +1368,7 @@ the codebase that you want to work on.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm), David (dgoulet)/i
+Likely Mentors: iDavid (dgoulet)/i
 p
 We're working on a revamp of the entire Tor hidden service design to
 improve the security and reliability of the hidden service system.
@@ -1410,7 +1405,7 @@ the codebase that you want to work on.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm), David (dgoulet)/i
+Likely Mentors: iDavid (dgoulet)/i
 p
 Right now, you can only use Tor's DNS support to look up IPv4 and IPv6
 addresses, and to fetch PTR records.  But DNS can do so much more!
@@ -1446,7 +1441,7 @@ the codebase that you want to work on.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm), David (dgoulet)/i
+Likely Mentors: iDavid (dgoulet)/i
 p
 The seccomp2 mechanism on Linux lets programs improve their robustness
 against unforseen bugs by running with restrictions on which system
@@ -1511,7 +1506,7 @@ the codebase that you want to work on.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iGeorg (GeKo)/i, iMike Perry/i, iNicolas 
Vigier/i
+Likely Mentors: iGeorg (GeKo)/i
 p
 
 The a href=https://panopticlick.eff.org;Panopticlick project by the EFF/a
@@ -1561,6 +1556,7 @@ implementation.
 /p
 /li
 
+!--
 a id=improveStegotorus/a
 li
 bImprove Stegotorus/b
@@ -1622,7 +1618,9 @@ You can find a list of open issues concerning Stegotorus 
a href=https://trac.t
 You also can think of lots of other awesome creative ways of improving 
Stegotorus and include those in your proposal.
 /p
 /li
+--
 
+!--
 a id=newBridgedbDistributor/a
 li
 bNew BridgeDB Distributor/b
@@ -1657,7 +1655,7 @@ 

[tor-commits] [webwml/staging] Add note about security issues

2015-02-10 Thread sebastian
commit 6f1225fc6c52b172e33de1cc11e3780f82e55abc
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 18:27:53 2015 +0100

Add note about security issues
---
 about/en/contact.wml |   10 ++
 1 file changed, 10 insertions(+)

diff --git a/about/en/contact.wml b/about/en/contact.wml
index e1e1d6c..e7d6c2c 100644
--- a/about/en/contact.wml
+++ b/about/en/contact.wml
@@ -19,6 +19,7 @@
 lia href=#twitterTwitter/a/li
 lia href=#phoneTelephone/a/li
 lia href=#mailMailing Address/a/li
+lia href=#securitySecurity Issues/a/li
 /ul
 
 a id=support/a
@@ -105,6 +106,15 @@
  Cambridge, MA 02139-2403 USA/p
 /p
 
+a id=security/a
+h3a class=anchor href=#securitySecurity Issues/a/h3
+pIf you found a security issue in one of our projects or our
+infrastructure, please email the respective maintainer. You can find
+their GPG fingerprint/key on our a
+href=https://db.torproject.org;developer ldap search page/a. Due
+to the many different projects we have, we do not offer a single
+list for security issues.
+
   /div
   !-- END MAINCOL --
   div id = sidecol



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Minors changes on the text. Replaced autoresponder by robot. Fixed length of links.

2015-02-10 Thread sebastian
commit 341f6034fbbe6c831c39aee42058187731156ed0
Author: ileiva ile...@users.noreply.github.com
Date:   Sun Feb 8 16:45:00 2015 -0300

Minors changes on the text. Replaced autoresponder by robot. Fixed length 
of links.
---
 projects/en/gettor.wml |   38 ++
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml
index 0bf1854..d7b0d3b 100644
--- a/projects/en/gettor.wml
+++ b/projects/en/gettor.wml
@@ -2,7 +2,7 @@
 # Revision: $Revision$
 # Translation-Priority: 3-low
 
-#include head.wmi TITLE=Tor Project: GetTor autoresponder CHARSET=UTF-8
+#include head.wmi TITLE=Tor Project: GetTor robot CHARSET=UTF-8
 div id=content class=clearfix
div id=breadcrumbs
 a href=page indexHome raquo; /a
@@ -11,20 +11,21 @@
   /div
div id=maincol 
 
-h1GetTor autoresponder/h1
-pGetTor is a program that presents alternative methods to download Tor
-Browser, specially when access to Tor Project's official website and mirrors
-is blocked. For now, the only available method is SMTP (email)./p
+h1GetTor robot/h1
+pGetTor is a service that provides alternative methods to download Tor
+Browser, specially for situations where access to Tor Project's official
+website and mirrors is blocked. For now, the only available method is
+SMTP (email)./p
 
 h2Download Tor Browser via email/h2
 
 pUsers can communicate with GetTor robot by sending messages via email. 
-Currently, the best known GetTor email address is gettor @ torproject.org. 
-This should be the most current stable GetTor robot as it is operated by 
-Tor Project./p
+Currently, the best known email address to do this is get...@torproject.org.
+This should be the most current and stable GetTor robot as it is operated
+by Tor Project itself./p
 
-pTo ask for Tor Browser a user should send an email to GetTor robot with 
-one of the following options in the message body:/p
+pTo ask for Tor Browser, a user should send an email to GetTor robot with 
+one of the following options in the body of the message:/p
 
 ul
listrongwindows/strong: If the user needs Tor Browser for Windows.
@@ -35,11 +36,11 @@ one of the following options in the message body:/p
/li
 /ul
 
-pOptions are case insensitive. If a user select two or more options, only 
+pOptions are case insensitive. If a user selects two or more options, only 
 the first one will be considered. After the user sends a valid option, GetTor 
 robot will reply with links to download Tor Browser from popular cloud 
 services. For now, the only cloud service supported is Dropbox. A sample 
-reply from GetTor robot should look like this:/p
+reply from GetTor robot should look similar to this:/p
 
 pre
Thank you for your request for windows-en.
@@ -52,9 +53,14 @@ reply from GetTor robot should look like this:/p
 
Dropbox
 
-   Package (32/64-bit): 
https://www.dropbox.com/s/0p4oew8w2u7vzv2/torbrowser-install-4.0.1_en-US.exe?dl=1
-   ASC signature (32/64-bit): 
https://www.dropbox.com/s/y68hhrk378lygn4/torbrowser-install-4.0.1_en-US.exe.asc?dl=1
-   Package SHA256 checksum (32/64-bit): 
e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10
+   Package (32/64-bit):
+   https://www.dropbox.com/s/0p4oew8w/torbrowser-install-4.0.1_en-US.exe?dl=1
+
+   ASC signature (32/64-bit):
+   https://www.dropbox.com/s/y68h/torbrowser-install-4.0.1_en-US.exe.asc?dl=1
+
+   Package SHA256 checksum (32/64-bit):
+   e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10
 
Fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
 
@@ -105,7 +111,7 @@ install instructions/a to start using Tor Browser. A user 
that can't
 reach the Tor network after the install process should consider using
 a href=https://bridges.torproject.org;bridges/a or
 a href=https://www.torproject.org/docs/pluggable-transports.html.en;
-pluggable transports/a. This guide will be provided by the GetTor
+pluggable transports/a. These guides will be provided by the GetTor
 robot in the future.
 /p
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Remove useless sentence on gettor page (thanks ilv)

2015-02-10 Thread sebastian
commit a0e2fa74e1cf7d47bc5ce704bd54fd889b7710f6
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 04:23:19 2015 +0100

Remove useless sentence on gettor page (thanks ilv)
---
 projects/en/gettor.wml |6 --
 1 file changed, 6 deletions(-)

diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml
index ff9e3bd..67fd9fb 100644
--- a/projects/en/gettor.wml
+++ b/projects/en/gettor.wml
@@ -56,12 +56,6 @@ pluggable transports/a. These guides will be provided by 
the GetTor
 robot in the future.
 /p
 
-p
-If a user requests an invalid option, GetTor robot will reply with a
-help message explaining how to interact with it.
-/p
-
-
   /div
   !-- END MAINCOL --
   div id = sidecol

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] tweak the gettor page a little

2015-02-10 Thread sebastian
commit 7c03ac85ca68f647573a10d416ba9f66f052fa94
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 04:13:14 2015 +0100

tweak the gettor page a little
---
 projects/en/gettor.wml |   81 +---
 1 file changed, 14 insertions(+), 67 deletions(-)

diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml
index d7b0d3b..ff9e3bd 100644
--- a/projects/en/gettor.wml
+++ b/projects/en/gettor.wml
@@ -9,7 +9,7 @@
 a href=page projects/projectsProjects raquo; /a
 a href=page projects/gettorGetTor raquo; /a
   /div
-   div id=maincol 
+   div id=maincol
 
 h1GetTor robot/h1
 pGetTor is a service that provides alternative methods to download Tor
@@ -19,12 +19,12 @@ SMTP (email)./p
 
 h2Download Tor Browser via email/h2
 
-pUsers can communicate with GetTor robot by sending messages via email. 
+pUsers can communicate with GetTor robot by sending messages via email.
 Currently, the best known email address to do this is get...@torproject.org.
 This should be the most current and stable GetTor robot as it is operated
 by Tor Project itself./p
 
-pTo ask for Tor Browser, a user should send an email to GetTor robot with 
+pTo ask for Tor Browser, a user should send an email to GetTor robot with
 one of the following options in the body of the message:/p
 
 ul
@@ -36,69 +36,10 @@ one of the following options in the body of the message:/p
/li
 /ul
 
-pOptions are case insensitive. If a user selects two or more options, only 
-the first one will be considered. After the user sends a valid option, GetTor 
-robot will reply with links to download Tor Browser from popular cloud 
-services. For now, the only cloud service supported is Dropbox. A sample 
-reply from GetTor robot should look similar to this:/p
-
-pre
-   Thank you for your request for windows-en.
-
-   Here are the download links:
-
-   ===
-   Tor Browser Bundle:
-   ===
-
-   Dropbox
-
-   Package (32/64-bit):
-   https://www.dropbox.com/s/0p4oew8w/torbrowser-install-4.0.1_en-US.exe?dl=1
-
-   ASC signature (32/64-bit):
-   https://www.dropbox.com/s/y68h/torbrowser-install-4.0.1_en-US.exe.asc?dl=1
-
-   Package SHA256 checksum (32/64-bit):
-   e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10
-
-   Fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
-
-   ===
-   Support:
-   ===
-
-   Still need help? If you have any questions, trouble connecting to Tor
-   network, or need to talk to a human, please contact our support team at:
-
- h...@rt.torproject.org
-
-   We are ready to answer your queries in English, Farsi, Chinese, Arabic,
-   French and Spanish.
-/pre
-br
-
-pIf a user sends something different from the options mentioned before, 
-GetTor robot will reply with a help message explaining how to interact with 
-it. A sample help message should look like this:/p
-
-pre
-   Hello, this is the 'GetTor' robot.
-
-   Thank you for your request. I am here to help you download the latest
-   Tor Browser Bundle.
-
-   Please reply to this message with one of the options below:
-
-   windows
-   linux
-   osx
-
-   And I will send you the download instructions quickly.
-
-   Tip: Just send a blank reply to this message if you are not sure.
-/pre
-br
+pOptions are case insensitive. If a user selects two or more options, only
+the first one will be considered. After the user sends a valid option, GetTor
+robot will reply with links to download Tor Browser from popular cloud
+services. For now, the only cloud service supported is Dropbox./p
 
 p
 Once the files have been downloaded users should strongverify the
@@ -115,6 +56,12 @@ pluggable transports/a. These guides will be provided by 
the GetTor
 robot in the future.
 /p
 
+p
+If a user requests an invalid option, GetTor robot will reply with a
+help message explaining how to interact with it.
+/p
+
+
   /div
   !-- END MAINCOL --
   div id = sidecol
@@ -124,4 +71,4 @@ robot in the future.
   !-- END SIDECOL --
 /div
 !-- END CONTENT --
-#include foot.wmi  
+#include foot.wmi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Remove useless sentence on gettor page (thanks ilv)

2015-02-10 Thread sebastian
commit a0e2fa74e1cf7d47bc5ce704bd54fd889b7710f6
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 04:23:19 2015 +0100

Remove useless sentence on gettor page (thanks ilv)
---
 projects/en/gettor.wml |6 --
 1 file changed, 6 deletions(-)

diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml
index ff9e3bd..67fd9fb 100644
--- a/projects/en/gettor.wml
+++ b/projects/en/gettor.wml
@@ -56,12 +56,6 @@ pluggable transports/a. These guides will be provided by 
the GetTor
 robot in the future.
 /p
 
-p
-If a user requests an invalid option, GetTor robot will reply with a
-help message explaining how to interact with it.
-/p
-
-
   /div
   !-- END MAINCOL --
   div id = sidecol

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Remove note to closed bug on FAQ

2015-02-10 Thread sebastian
commit 8c76eeae2ddaecc7e736597ddee4bbdaa52613a1
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 05:17:32 2015 +0100

Remove note to closed bug on FAQ
---
 docs/en/faq.wml |5 -
 1 file changed, 5 deletions(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index a6c3e28..be15a45 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -1587,11 +1587,6 @@ 
href=http://www.crowdstrike.com/community-tools/index.html#tool-79;proposed
 pre
 ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
 /pre
-p
-This third option is pretty klunky right now; see e.g. a
-href=https://trac.torproject.org/projects/tor/ticket/10449;this bug/a;
-but we're hoping it will become an easy option in the future.
-/p
 
 hr
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Fix osx gpg instructions (#12563)

2015-02-10 Thread sebastian
commit dfef746338aeb274bcd24e1e478e07bebd108eff
Author: Sebastian Hahn sebast...@torproject.org
Date:   Mon Feb 9 22:52:42 2015 +0100

Fix osx gpg instructions (#12563)
---
 docs/en/verifying-signatures.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index 856e01c..430e5e8 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -137,7 +137,7 @@
 to download the .asc file as well. Assuming you downloaded the
 package and its signature to your Desktop, run:/p
 
-pregpg --verify 
/Users/Alice/TorBrowser-version-torbrowserbundleosx32-osx32_en-US.dmg{.asc*,}/pre
+pregpg --verify 
~/Desktop/TorBrowser-version-torbrowserbundleosx32-osx32_en-US.dmg{.asc*,}/pre
 
 pThe output should say Good signature: /p
 
@@ -220,7 +220,7 @@
   Windows you can use the a href=http://md5deep.sourceforge.net/;
   hashdeep utility/a and run
   preC:\location\where\you\saved\hashdeep -c sha256sum lt;TOR BROWSER 
FILE NAMEgt;.exe/pre
-  On Mac or Linux you can run presha256sum lt;TOR BROWSER FILE 
NAMEgt;.zip/pre or presha256sum lt;TOR BROWSER FILE NAMEgt;.tar.gz/pre 
without having to download a utility./li
+  On Mac or Linux you can run presha256sum lt;TOR BROWSER FILE 
NAMEgt;.dmg/pre or presha256sum lt;TOR BROWSER FILE NAMEgt;.tar.gz/pre 
without having to download a utility./li
   liYou will see a string of letters and numbers./li
   liOpen sha256sums.txt in a text editor./li
   liLocate the name of the Tor Browser file you downloaded./li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] tweak the gettor page a little

2015-02-10 Thread sebastian
commit 7c03ac85ca68f647573a10d416ba9f66f052fa94
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 04:13:14 2015 +0100

tweak the gettor page a little
---
 projects/en/gettor.wml |   81 +---
 1 file changed, 14 insertions(+), 67 deletions(-)

diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml
index d7b0d3b..ff9e3bd 100644
--- a/projects/en/gettor.wml
+++ b/projects/en/gettor.wml
@@ -9,7 +9,7 @@
 a href=page projects/projectsProjects raquo; /a
 a href=page projects/gettorGetTor raquo; /a
   /div
-   div id=maincol 
+   div id=maincol
 
 h1GetTor robot/h1
 pGetTor is a service that provides alternative methods to download Tor
@@ -19,12 +19,12 @@ SMTP (email)./p
 
 h2Download Tor Browser via email/h2
 
-pUsers can communicate with GetTor robot by sending messages via email. 
+pUsers can communicate with GetTor robot by sending messages via email.
 Currently, the best known email address to do this is get...@torproject.org.
 This should be the most current and stable GetTor robot as it is operated
 by Tor Project itself./p
 
-pTo ask for Tor Browser, a user should send an email to GetTor robot with 
+pTo ask for Tor Browser, a user should send an email to GetTor robot with
 one of the following options in the body of the message:/p
 
 ul
@@ -36,69 +36,10 @@ one of the following options in the body of the message:/p
/li
 /ul
 
-pOptions are case insensitive. If a user selects two or more options, only 
-the first one will be considered. After the user sends a valid option, GetTor 
-robot will reply with links to download Tor Browser from popular cloud 
-services. For now, the only cloud service supported is Dropbox. A sample 
-reply from GetTor robot should look similar to this:/p
-
-pre
-   Thank you for your request for windows-en.
-
-   Here are the download links:
-
-   ===
-   Tor Browser Bundle:
-   ===
-
-   Dropbox
-
-   Package (32/64-bit):
-   https://www.dropbox.com/s/0p4oew8w/torbrowser-install-4.0.1_en-US.exe?dl=1
-
-   ASC signature (32/64-bit):
-   https://www.dropbox.com/s/y68h/torbrowser-install-4.0.1_en-US.exe.asc?dl=1
-
-   Package SHA256 checksum (32/64-bit):
-   e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10
-
-   Fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
-
-   ===
-   Support:
-   ===
-
-   Still need help? If you have any questions, trouble connecting to Tor
-   network, or need to talk to a human, please contact our support team at:
-
- h...@rt.torproject.org
-
-   We are ready to answer your queries in English, Farsi, Chinese, Arabic,
-   French and Spanish.
-/pre
-br
-
-pIf a user sends something different from the options mentioned before, 
-GetTor robot will reply with a help message explaining how to interact with 
-it. A sample help message should look like this:/p
-
-pre
-   Hello, this is the 'GetTor' robot.
-
-   Thank you for your request. I am here to help you download the latest
-   Tor Browser Bundle.
-
-   Please reply to this message with one of the options below:
-
-   windows
-   linux
-   osx
-
-   And I will send you the download instructions quickly.
-
-   Tip: Just send a blank reply to this message if you are not sure.
-/pre
-br
+pOptions are case insensitive. If a user selects two or more options, only
+the first one will be considered. After the user sends a valid option, GetTor
+robot will reply with links to download Tor Browser from popular cloud
+services. For now, the only cloud service supported is Dropbox./p
 
 p
 Once the files have been downloaded users should strongverify the
@@ -115,6 +56,12 @@ pluggable transports/a. These guides will be provided by 
the GetTor
 robot in the future.
 /p
 
+p
+If a user requests an invalid option, GetTor robot will reply with a
+help message explaining how to interact with it.
+/p
+
+
   /div
   !-- END MAINCOL --
   div id = sidecol
@@ -124,4 +71,4 @@ robot in the future.
   !-- END SIDECOL --
 /div
 !-- END CONTENT --
-#include foot.wmi  
+#include foot.wmi

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] give an extra help for people confused by os x gatekeeper

2015-02-10 Thread sebastian
commit 1e96f7e96f192dd341854b5b9ac709775f9a2a50
Author: Roger Dingledine a...@torproject.org
Date:   Sun Feb 8 21:29:09 2015 -0500

give an extra help for people confused by os x gatekeeper
---
 projects/en/torbrowser.wml |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 95ae518..99e80ed 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -516,7 +516,10 @@
 div class=pjtitleh2Mac OS X Instructions/h2/div
 div class=pjtext
   pDownload the file above, save it somewhere, then click on it.
-  This opens the .dmg file. Drag the included file into your Applications 
folder and you will
+  This opens the .dmg file. (On recent versions of OS X, you might get
+  a warning that it's from an unidentified developer mdash; you can
+  get around this complaint by a 
href=https://tor.stackexchange.com/questions/1187/my-osx-is-saying-torbrowserbundle-en-us-cant-be-opened-because-it-is-from-an;control-clicking
 and selecting open/a.)
+  Drag the included file into your Applications folder and you will
   have a Tor Browser application in your chosen language that you
   can pin on your Dock./p
 /div



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Merge remote-tracking branch 'ilv/gettor_update'

2015-02-10 Thread sebastian
commit fa94aafc07b39793c82b79accda6897fd2ad0d3d
Merge: 5b21753 341f603
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 04:01:21 2015 +0100

Merge remote-tracking branch 'ilv/gettor_update'

 projects/en/gettor.wml |   38 ++
 1 file changed, 22 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] add harmony onto the people page

2015-02-10 Thread sebastian
commit 5b21753a8a4ff9212f87b8d9f205cd337c1901b0
Author: Roger Dingledine a...@torproject.org
Date:   Tue Feb 10 20:59:30 2015 -0500

add harmony onto the people page

(many other people are missing lately -- please help add them!)
---
 about/en/corepeople.wml |4 
 1 file changed, 4 insertions(+)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 15e64b6..af84ffe 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -163,6 +163,10 @@
   Tor better. Generally helps everything run smoothly. Runs one
   of the directory authorities./dd
 
+  dtHarmony, Support, Advocate/dt
+  ddWrites for a href=wikiTorWeeklyNews/Tor Weekly
+  News/a, the help desk, and the browser manual./dd
+
   dtDr. Nick Hopper, Researcher/dt
   ddCryptographer, privacy expert, and professor./dd
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] make the specblob tag be more right

2015-02-10 Thread sebastian
commit 39fb3c52a47d4178ecc521a7fa0ca1f83044f07e
Author: Roger Dingledine a...@torproject.org
Date:   Tue Feb 10 20:16:26 2015 -0500

make the specblob tag be more right

it'd be great if somebody would go through the other gitweb
tags and change them to be correct with our new gitweb
---
 include/links.wmi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/links.wmi b/include/links.wmi
index 31d3032..3879652 100644
--- a/include/links.wmi
+++ b/include/links.wmi
@@ -10,7 +10,7 @@
 define-tag wikifaq 
whitespace=deletehttps://trac.torproject.org/projects/tor/wiki/doc/TorFAQ/define-tag
 define-tag blog 
whitespace=deletehttps://blog.torproject.org/blog//define-tag
 define-tag tbbrepo 
whitespace=deletehttps://gitweb.torproject.org/torbrowser.git/blob_plain/HEAD:/define-tag
-define-tag specblob 
whitespace=deletehttps://gitweb.torproject.org/torspec.git?a=blob_plain;hb=HEAD;f=/define-tag
+define-tag specblob 
whitespace=deletehttps://gitweb.torproject.org/torspec.git/tree//define-tag
 define-tag spectree 
whitespace=deletehttps://gitweb.torproject.org/torspec.git?a=tree;hb=HEAD;f=/define-tag
 define-tag doxygen 
whitespace=deletehttps://doxygen.torproject.org//define-tag
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Add George as a potential mentor of the HS project

2015-02-10 Thread sebastian
commit 1b53532871a3a65da9c4487a36188bdff6fad211
Author: Damian Johnson ata...@torproject.org
Date:   Sun Feb 8 13:08:37 2015 -0800

Add George as a potential mentor of the HS project
---
 getinvolved/en/volunteer.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 92bf903..ab1b164 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1368,7 +1368,7 @@ the codebase that you want to work on.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iDavid (dgoulet)/i
+Likely Mentors: iDavid (dgoulet), George (asn)/i
 p
 We're working on a revamp of the entire Tor hidden service design to
 improve the security and reliability of the hidden service system.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Link to blog post to document https hs issues

2015-02-10 Thread sebastian
commit 283c148b0e30567228d96c72a689088a45b221c6
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 06:46:56 2015 +0100

Link to blog post to document https hs issues
---
 docs/en/tor-hidden-service.wml |   18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/docs/en/tor-hidden-service.wml b/docs/en/tor-hidden-service.wml
index c817d78..3c7664f 100644
--- a/docs/en/tor-hidden-service.wml
+++ b/docs/en/tor-hidden-service.wml
@@ -216,16 +216,20 @@
 Apache, and learn something about your operating system./li
 liIf your computer isn't online all the time, your hidden service
 won't be either. This leaks information to an observant adversary./li
-liIt is generally a better idea to host hidden services on a Tor client 
+liIt is generally a better idea to host hidden services on a Tor client
 rather than a Tor relay, since relay uptime and other properties are
 publicly visible./li
-!-- increased risks over time --
+liThe longer a hidden is online, the higher the risk that its
+location is discovered. The most prominent attacks are building a
+profile of the hidden service's availability and matching induced
+traffic patterns./li
 /ul
 
-hr
-
-pIf you have suggestions for improving this document, please a
-href=page about/contactsend them to us/a. Thanks!/p
+pAnother common issue is whether to use HTTPS on your relay or
+not. Have a look at this a
+
href=https://blog.torproject.org/blog/facebook-hidden-services-and-https-certs;post/a
+on the Tor Blog to learn more about these issues.
+/p
   /div
   !-- END MAINCOL --
   div id = sidecol
@@ -235,4 +239,4 @@
   !-- END SIDECOL --
 /div
 !-- END CONTENT --
-#include foot.wmi  
+#include foot.wmi

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Say Tor Browser Bundle in fewer places

2015-02-10 Thread sebastian
commit 73ba951c071fa112678e41bf66e9cfa06b4722bb
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 08:00:37 2015 +0100

Say Tor Browser Bundle in fewer places
---
 docs/en/pluggable-transports.wml |2 +-
 docs/en/tor-doc-osx.wml  |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 5b079ed..45c07d9 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -146,7 +146,7 @@ transport API/a, to make it easier to build interoperable 
programs.
 
 hr
 a id=download/a
-h2a href=page download/download-easyDownload the Pluggable 
Transports Tor Browser Bundle/a/h2
+h2a href=page download/download-easyDownload the Pluggable 
Transports Tor Browser/a/h2
 p
 As of Tor Browser 3.6-beta-1, pluggable transports are now included in the
 a href=page download/download-easyofficial
diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml
index 1ea21ff..a3990af 100644
--- a/docs/en/tor-doc-osx.wml
+++ b/docs/en/tor-doc-osx.wml
@@ -15,11 +15,11 @@
 
 h2These are advanced installation instructions for running
 Tor in a command line. The recommended way to use Tor is to simply 
download the
-a href=page projects/torbrowserTor Browser Bundle/a and you
+a href=page projects/torbrowserTor Browser/a and you
 are done.
 /h2
 
-pEven though the Tor Browser Bundle comes with a regular Tor, and you 
could use the graphical interface to configure Tor as a relay and bridge 
easily, it will only run as long as you keep the Tor Browser open. The 
following instructions will set up Tor without graphical interface or a 
browser. Many people prefer this over TBB when they host hidden services or 
relay traffic for other Tor users. 
+pEven though the Tor Browser comes with a regular Tor, and you could use 
the graphical interface to configure Tor as a relay and bridge easily, it will 
only run as long as you keep the Tor Browser open. The following instructions 
will set up Tor without graphical interface or a browser. Many people prefer 
this over TBB when they host hidden services or relay traffic for other Tor 
users. 
 hr
 a id=installing/a
 h2a class=anchor href=#installingStep One: Install 
Homebrew/a/h2
@@ -54,7 +54,7 @@
 h2a class=anchor href=#usingStep Four: Configure your application 
to use Tor/a/h2
 
 p
-If you want to use Tor for anonymous web browsing, please use the a 
href=page projects/torbrowserTor Browser Bundle/a. It comes with readily 
configured Tor and a browser patched for better anonymity. To use SOCKS 
directly (for instant messaging, Jabber, IRC, etc),
+If you want to use Tor for anonymous web browsing, please use the a 
href=page projects/torbrowserTor Browser/a. It comes with readily 
configured Tor and a browser patched for better anonymity. To use SOCKS 
directly (for instant messaging, Jabber, IRC, etc),
 you can point your application directly at Tor (localhost
 port 9050), but see a href=wikifaq#SOCKSAndDNSthis FAQ
 entry/a for why this may be dangerous. For applications



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] spaces

2015-02-10 Thread sebastian
commit 27c5c153fc5ff239554e5a420aa4f469dd0bfc36
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 08:01:00 2015 +0100

spaces
---
 docs/en/tor-doc-osx.wml |   54 +++
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml
index a3990af..9f280e1 100644
--- a/docs/en/tor-doc-osx.wml
+++ b/docs/en/tor-doc-osx.wml
@@ -8,51 +8,51 @@
 a href=page indexHome raquo; /a
 a href=page docs/documentationDocumentation raquo; /a
 a href=page docs/tor-doc-osxMac OS X Client/a
-  /div 
+  /div
   div id=maincol
 h1Running Tor on Mac OS X/h1
 br
-
+
 h2These are advanced installation instructions for running
 Tor in a command line. The recommended way to use Tor is to simply 
download the
 a href=page projects/torbrowserTor Browser/a and you
 are done.
 /h2
-
-pEven though the Tor Browser comes with a regular Tor, and you could use 
the graphical interface to configure Tor as a relay and bridge easily, it will 
only run as long as you keep the Tor Browser open. The following instructions 
will set up Tor without graphical interface or a browser. Many people prefer 
this over TBB when they host hidden services or relay traffic for other Tor 
users. 
+
+pEven though the Tor Browser comes with a regular Tor, and you could use 
the graphical interface to configure Tor as a relay and bridge easily, it will 
only run as long as you keep the Tor Browser open. The following instructions 
will set up Tor without graphical interface or a browser. Many people prefer 
this over TBB when they host hidden services or relay traffic for other Tor 
users.
 hr
 a id=installing/a
 h2a class=anchor href=#installingStep One: Install 
Homebrew/a/h2
 br
-
+
 p
 The advanced Tor without any graphical user interface can be installed 
using a href=http://brew.sh;the Homebrew package manager/a. It is most 
suitable if you want to use Tor as a SOCKS proxy for applications other than 
web browsing, or run a Tor relay/bridge to help other Tor users. If you use the 
command-line Tor, you might be interested in a href=page 
projects/armarm/a, a command-line Tor monitor.
 /p
-
+
 pIf you don't have Homebrew installed, open a terminal window and 
run:/p
- 
+
 preruby -e $(curl -fsSkL 
https://raw.githubusercontent.com/Homebrew/install/master/install)/pre
-
+
 hr
 h2Step Two: Install Tor/a/h2
 br
-
+
 pIn a terminal window, run:/p
 
 prebrew install tor/pre
- 
+
 pYou will find the Tor configuration file at 
tt/usr/local/etc/tor/torrc/tt./p
- 
+
 hr
 a id=verify/a
 h2a class=anchor href=#verifyStep Three: Verify your 
download/a/h2
-  
+
 pAs with any application, you should make sure it came unmodified from 
the orginal source. Unfortunately, Homebrew does not come with integrated 
verification for downloads, and anyone could submit a modified Tor! Currently, 
we don't have good instructions on how to verify the Tor download on Mac OSX. 
If you think you do, please a href=page about/contactlet us know/a!/p
 
 hr
-a id=using/a 
+a id=using/a
 h2a class=anchor href=#usingStep Four: Configure your application 
to use Tor/a/h2
-
+
 p
 If you want to use Tor for anonymous web browsing, please use the a 
href=page projects/torbrowserTor Browser/a. It comes with readily 
configured Tor and a browser patched for better anonymity. To use SOCKS 
directly (for instant messaging, Jabber, IRC, etc),
 you can point your application directly at Tor (localhost
@@ -60,11 +60,11 @@
 entry/a for why this may be dangerous. For applications
 that support neither SOCKS nor HTTP, take a look at a
 href=http://www.dest-unreach.org/socat/;socat/a./p
-
+
 pFor information on how to Torify other applications, check out the
 a href=wikidoc/TorifyHOWTOTorify HOWTO/a.
 /p
-
+
 pIf you have a personal firewall that limits your computer's
 ability to connect to itself, be sure to allow connections from
 your local applications to local port 9050. If your
@@ -72,25 +72,25 @@
 connect to at least TCP ports 80 and 443, and then see a
 href=wikifaq#FirewalledClientthis FAQ entry/a.
 /p
-
+
 pIf it's still not working, look at a
 href=page docs/faq#DoesntWorkthis FAQ entry/a for hints./p
-
+
 p
 Once it's working, learn more about a href=page
 download/download#Warningwhat Tor does and does not offer/a.
 /p
-
+
 hr
 a id=server/a
 a id=relay/a
 h2a class=anchor href=#relayConfigure Tor as a relay/a/h2
 br
-
+
 pThe Tor network relies on volunteers to donate bandwidth. If you
 want to help strongmake the Tor network faster/strong, please
 consider a href=page docs/tor-doc-relayrunning a relay/a./p
-
+
 hr
 a id=uninstall/a
 h2a class=anchor href

[tor-commits] [webwml/master] Rewrite OS X document to refer to macports

2015-02-10 Thread sebastian
commit 9fcd16f2c32c4d69ba70935f8de956bcafd0e563
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 08:08:38 2015 +0100

Rewrite OS X document to refer to macports
---
 docs/en/tor-doc-osx.wml |   70 ++-
 1 file changed, 27 insertions(+), 43 deletions(-)

diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml
index 9f280e1..6840b4b 100644
--- a/docs/en/tor-doc-osx.wml
+++ b/docs/en/tor-doc-osx.wml
@@ -19,58 +19,53 @@
 are done.
 /h2
 
-pEven though the Tor Browser comes with a regular Tor, and you could use 
the graphical interface to configure Tor as a relay and bridge easily, it will 
only run as long as you keep the Tor Browser open. The following instructions 
will set up Tor without graphical interface or a browser. Many people prefer 
this over TBB when they host hidden services or relay traffic for other Tor 
users.
-hr
+pEven though the Tor Browser comes with a regular Tor, it will only run
+as long as you keep the Tor Browser open. The following instructions will
+set up Tor without graphical interface or a browser. Many people prefer
+this over TBB when they host hidden services or relay traffic for other Tor
+users.  hr
 a id=installing/a
-h2a class=anchor href=#installingStep One: Install 
Homebrew/a/h2
+h2a class=anchor href=#installingStep One: Install 
Macports/a/h2
 br
 
 p
-The advanced Tor without any graphical user interface can be installed 
using a href=http://brew.sh;the Homebrew package manager/a. It is most 
suitable if you want to use Tor as a SOCKS proxy for applications other than 
web browsing, or run a Tor relay/bridge to help other Tor users. If you use the 
command-line Tor, you might be interested in a href=page 
projects/armarm/a, a command-line Tor monitor.
+Macports is a package manager for Mac OS X which provides a Tor package,
+along a lot of other stuff. Follow the instructions on a
+href=https://www.macports.org/install.php;its Website/a to install.
 /p
 
-pIf you don't have Homebrew installed, open a terminal window and 
run:/p
-
-preruby -e $(curl -fsSkL 
https://raw.githubusercontent.com/Homebrew/install/master/install)/pre
-
 hr
 h2Step Two: Install Tor/a/h2
 br
 
-pIn a terminal window, run:/p
+pIn a Terminal window, run:/p
 
-prebrew install tor/pre
+presudo port install tor/pre
 
-pYou will find the Tor configuration file at 
tt/usr/local/etc/tor/torrc/tt./p
-
-hr
-a id=verify/a
-h2a class=anchor href=#verifyStep Three: Verify your 
download/a/h2
-
-pAs with any application, you should make sure it came unmodified from 
the orginal source. Unfortunately, Homebrew does not come with integrated 
verification for downloads, and anyone could submit a modified Tor! Currently, 
we don't have good instructions on how to verify the Tor download on Mac OSX. 
If you think you do, please a href=page about/contactlet us know/a!/p
+pYou will find a sample Tor configuration file at
+tt/opt/local/etc/tor/torrc.sample/tt. Remove the .sample extension to
+make it effective./p
 
 hr
 a id=using/a
-h2a class=anchor href=#usingStep Four: Configure your application 
to use Tor/a/h2
+h2a class=anchor href=#usingStep Three: Configure your application 
to use Tor/a/h2
 
 p
-If you want to use Tor for anonymous web browsing, please use the a 
href=page projects/torbrowserTor Browser/a. It comes with readily 
configured Tor and a browser patched for better anonymity. To use SOCKS 
directly (for instant messaging, Jabber, IRC, etc),
-you can point your application directly at Tor (localhost
-port 9050), but see a href=wikifaq#SOCKSAndDNSthis FAQ
-entry/a for why this may be dangerous. For applications
-that support neither SOCKS nor HTTP, take a look at a
-href=http://www.dest-unreach.org/socat/;socat/a./p
+To use SOCKS directly (for instant messaging, Jabber, IRC, etc), you can
+point your application directly at Tor (localhost port 9050), but see a
+href=wikifaq#SOCKSAndDNSthis FAQ entry/a for why this may be
+dangerous. For applications that support neither SOCKS nor HTTP, take a
+look at a href=http://www.dest-unreach.org/socat/;socat/a./p
 
 pFor information on how to Torify other applications, check out the
 a href=wikidoc/TorifyHOWTOTorify HOWTO/a.
 /p
 
-pIf you have a personal firewall that limits your computer's
-ability to connect to itself, be sure to allow connections from
-your local applications to local port 9050. If your
-firewall blocks outgoing connections, punch a hole so it can
-connect to at least TCP ports 80 and 443, and then see a
-href=wikifaq#FirewalledClientthis FAQ entry/a.
+pIf you have a personal firewall that limits your computer's ability to
+connect to itself, be sure to allow connections from your local
+applications to local port

[tor-commits] [webwml/master] yuck trailing spaces

2015-02-10 Thread sebastian
commit 1e42e693794fc79bf4c51483338447f69ea5c4e1
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Feb 11 06:06:15 2015 +0100

yuck trailing spaces
---
 docs/en/hidden-services.wml |   40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/docs/en/hidden-services.wml b/docs/en/hidden-services.wml
index f7fceff..1b4125b 100644
--- a/docs/en/hidden-services.wml
+++ b/docs/en/hidden-services.wml
@@ -9,10 +9,10 @@
 a href=page docs/documentationDocumentation raquo; /a
 a href=page docs/hidden-servicesHidden Services/a
   /div
-  div id=maincol 
+  div id=maincol
 h2Tor: Hidden Service Protocol/h2
 hr
-
+
 p
 Tor makes it possible for users to hide their locations while offering
 various kinds of services, such as web publishing or an instant
@@ -23,7 +23,7 @@
 href=page docs/tor-hidden-serviceconfiguring hidden services/a
 page.
 /p
-
+
 p
 A hidden service needs to advertise its existence in the Tor network before
 clients will be able to contact it. Therefore, the service randomly picks
@@ -36,11 +36,11 @@
 service's identity (public key), we don't want them to learn about the
 hidden server's location (IP address).
 /p
-
+
 img alt=Tor hidden service step one src=$(IMGROOT)/THS-1.png
 # maybe add a speech bubble containing PK to Bob, because that's what
 # Bob tells to his introduction points
-
+
 p
 Step two: the hidden service assembles a emhidden service
 descriptor/em, containing its public key and a summary of each
@@ -50,7 +50,7 @@
 name derived from the service's public key. After
 this step, the hidden service is set up.
 /p
-
+
 p
 Although it might seem impractical to use an automatically-generated
 service name, it serves an important goal: Everyone ndash; including
@@ -62,12 +62,12 @@
 
href=http://www.skyhunter.com/marcs/petnames/IntroPetNames.html;Petname/a
 design for hidden service names?
 /p
-
+
 img alt=Tor hidden service step two src=$(IMGROOT)/THS-2.png
 # maybe replace database with DHT; further: how incorrect
 # is it to *not* add DB to the Tor cloud, now that begin dir cells are in
 # use?
-
+
 p
 Step three: A client that wants to contact a hidden service needs
 to learn about its onion address first. After that, the client can
@@ -80,11 +80,11 @@
 randomly picked relay and asks it to act as emrendezvous point/em
 by telling it a one-time secret.
 /p
-
+
 img alt=Tor hidden service step three src=$(IMGROOT)/THS-3.png
 # maybe add cookie to speech bubble, separated from the surrounded
 # IP1-3 and PK
-
+
 p
 Step four: When the descriptor is present and the rendezvous
 point is ready, the client assembles an emintroduce/em message
@@ -95,16 +95,16 @@
 via a Tor circuit: nobody can relate sending the introduce message
 to the client's IP address, so the client remains anonymous.
 /p
-
+
 img alt=Tor hidden service step four src=$(IMGROOT)/THS-4.png
-
+
 p
 Step five: The hidden service decrypts the client's introduce message
 and finds the address of the rendezvous point and the one-time secret
 in it. The service creates a circuit to the rendezvous point and
 sends the one-time secret to it in a rendezvous message.
 /p
-
+
 p
 At this point it is of special importance that the hidden service sticks to
 the same set of a
@@ -117,10 +117,10 @@
 a href=http://freehaven.net/anonbib/#hs-attack06;Locating Hidden
 Servers/a.
 /p
-
+
 img alt=Tor hidden service step five src=$(IMGROOT)/THS-5.png
 # it should say Bob connects to Alice's ...
-
+
 p
 In the last step, the rendezvous point notifies the client about successful
 connection establishment. After that, both client and hidden service can
@@ -128,23 +128,23 @@
 other. The rendezvous point simply relays (end-to-end encrypted) messages
 from client to service and vice versa.
 /p
-
+
 p
 One of the reasons for not using the introduction circuit
 for actual communication is that no single relay should
 appear to be responsible for a given hidden service. This is why the
 rendezvous point never learns about the hidden service's identity.
 /p
-
+
 p
 In general, the complete connection between client and hidden service
 consists of 6 relays: 3 of them were picked by the client with the third
 being the rendezvous point and the other 3 were picked by the hidden
 service.
 /p
-
+
 img alt=Tor hidden service step six src=$(IMGROOT)/THS-6.png
-
+
 p
 There are more detailed descriptions about the hidden service protocol than
 this one. See the
@@ -162,4 +162,4 @@
   !-- END SIDECOL --
 /div
 !-- END CONTENT --
-#include foot.wmi  
+#include foot.wmi

[tor-commits] [webwml/master] Updated config relay on install instructions

2015-02-10 Thread sebastian
commit 5dcef2ea0d17c0551e1bdd7f11fb16a6e88bc0cd
Author: ilv i...@users.noreply.github.com
Date:   Wed Feb 11 02:35:23 2015 -0300

Updated config relay on install instructions
---
 docs/en/tor-doc-unix.wml|   20 +++-
 docs/en/tor-doc-windows.wml |   26 +++---
 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/docs/en/tor-doc-unix.wml b/docs/en/tor-doc-unix.wml
index c04e10d..d50e8b7 100644
--- a/docs/en/tor-doc-unix.wml
+++ b/docs/en/tor-doc-unix.wml
@@ -91,23 +91,9 @@
 h2a class=anchor href=#relayStep Three: Configure it as a 
relay/a/h2
 br
 
-pThe Tor network relies on volunteers to donate bandwidth. The more
-people who run relays, the faster the Tor network will be. If you have
-at least 50 KiloBytes/s each way, please help out Tor by configuring your
-Tor to be a relay too. We have many features that make Tor relays easy
-and convenient, including rate limiting for bandwidth, exit policies so
-you can limit your exposure to abuse complaints, and support for dynamic
-IP addresses./p
-
-pHaving relays in many different places on
-the Internet is what makes Tor users secure. a
-href=wikifaq#DoIgetbetteranonymityifIrunarelayYou may also
-get stronger anonymity yourself/a, since remote sites can't know
-whether connections originated at your computer or were relayed
-from others./p
-
-pRead more at our a href=page docs/tor-doc-relayConfiguring a 
relay/a
-guide./p
+pThe Tor network relies on volunteers to donate bandwidth. If you
+want to help strongmake the Tor network faster/strong, please
+consider a href=page docs/tor-doc-relayrunning a relay/a./p
 
 hr
 
diff --git a/docs/en/tor-doc-windows.wml b/docs/en/tor-doc-windows.wml
index a339feb..dbeae88 100644
--- a/docs/en/tor-doc-windows.wml
+++ b/docs/en/tor-doc-windows.wml
@@ -22,12 +22,6 @@
 are done.
 /h2
 
-p
-bIf you want to relay traffic for others to help the network grow (please
-do), read the a href=page docs/tor-doc-relayConfiguring a relay/a
-guide./b
-/p
-
 pIf it's still not working, look at a
 href=page docs/faq#DoesntWorkthis
 FAQ entry/a for hints./p
@@ -43,23 +37,9 @@
 h2a class=anchor href=#relayConfiguring Tor as a relay/a/h2
 br
 
-pThe Tor network relies on volunteers to donate bandwidth. The more
-people who run relays, the faster the Tor network will be. If you have
-at least 250 KiloBytes/s each way, please help out Tor by configuring your
-Tor to be a relay too. We have many features that make Tor relays easy
-and convenient, including rate limiting for bandwidth, exit policies so
-you can limit your exposure to abuse complaints, and support for dynamic
-IP addresses./p
-
-pHaving relays in many different places on the Internet is what
-makes Tor users secure. a
-href=wikifaq#RelayAnonymityYou
-may also get stronger anonymity yourself/a,
-since remote sites can't know whether connections originated at your
-computer or were relayed from others./p
-
-pRead more at our a href=page docs/tor-doc-relayConfiguring a 
relay/a
-guide./p
+pThe Tor network relies on volunteers to donate bandwidth. If you
+want to help strongmake the Tor network faster/strong, please
+consider a href=page docs/tor-doc-relayrunning a relay/a./p
 
 hr
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Removed duplicated text about configuring a relay

2015-02-10 Thread sebastian
commit 8d10ea8d8f3d0dc84adf098dbee0ce50c311c8af
Author: ilv i...@users.noreply.github.com
Date:   Wed Feb 11 02:21:13 2015 -0300

Removed duplicated text about configuring a relay
---
 docs/en/tor-doc-osx.wml |   19 +++
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml
index 3d8b0f1..1ea21ff 100644
--- a/docs/en/tor-doc-osx.wml
+++ b/docs/en/tor-doc-osx.wml
@@ -87,22 +87,9 @@
 h2a class=anchor href=#relayConfigure Tor as a relay/a/h2
 br
 
-pThe Tor network relies on volunteers to donate bandwidth. The more
-people who run relays, the faster the Tor network will be. If you have
-at least 50 kilobytes/s each way, please help out Tor by configuring your
-Tor to be a relay too. We have many features that make Tor relays easy
-and convenient, including rate limiting for bandwidth, exit policies so
-you can limit your exposure to abuse complaints, and support for dynamic
-IP addresses./p
-
-pHaving relays in many different places on the Internet is what
-makes Tor users secure. a href=wikifaq#RelayAnonymityYou may
-also get stronger anonymity yourself/a, since remote sites can't
-know whether connections originated at your computer or were relayed
-from others./p
-
-pRead more at our a href=page docs/tor-doc-relayConfiguring a 
relay/a
-guide./p
+pThe Tor network relies on volunteers to donate bandwidth. If you
+want to help strongmake the Tor network faster/strong, please
+consider a href=page docs/tor-doc-relayrunning a relay/a./p
 
 hr
 a id=uninstall/a



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Fix osx gpg instructions (#12563)

2015-02-09 Thread sebastian
commit dfef746338aeb274bcd24e1e478e07bebd108eff
Author: Sebastian Hahn sebast...@torproject.org
Date:   Mon Feb 9 22:52:42 2015 +0100

Fix osx gpg instructions (#12563)
---
 docs/en/verifying-signatures.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index 856e01c..430e5e8 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -137,7 +137,7 @@
 to download the .asc file as well. Assuming you downloaded the
 package and its signature to your Desktop, run:/p
 
-pregpg --verify 
/Users/Alice/TorBrowser-version-torbrowserbundleosx32-osx32_en-US.dmg{.asc*,}/pre
+pregpg --verify 
~/Desktop/TorBrowser-version-torbrowserbundleosx32-osx32_en-US.dmg{.asc*,}/pre
 
 pThe output should say Good signature: /p
 
@@ -220,7 +220,7 @@
   Windows you can use the a href=http://md5deep.sourceforge.net/;
   hashdeep utility/a and run
   preC:\location\where\you\saved\hashdeep -c sha256sum lt;TOR BROWSER 
FILE NAMEgt;.exe/pre
-  On Mac or Linux you can run presha256sum lt;TOR BROWSER FILE 
NAMEgt;.zip/pre or presha256sum lt;TOR BROWSER FILE NAMEgt;.tar.gz/pre 
without having to download a utility./li
+  On Mac or Linux you can run presha256sum lt;TOR BROWSER FILE 
NAMEgt;.dmg/pre or presha256sum lt;TOR BROWSER FILE NAMEgt;.tar.gz/pre 
without having to download a utility./li
   liYou will see a string of letters and numbers./li
   liOpen sha256sums.txt in a text editor./li
   liLocate the name of the Tor Browser file you downloaded./li

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] s/build/finish for 'Build Better Pluggable Transports'

2015-02-08 Thread sebastian
commit e69eaee80c4eae62318bcaee2549346e7add607f
Author: Damian Johnson ata...@torproject.org
Date:   Fri Feb 6 08:37:40 2015 -0800

s/build/finish for 'Build Better Pluggable Transports'

Wording tweak requested by Ximin.
---
 getinvolved/en/volunteer.wml |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index fd26638..ddf479a 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1017,9 +1017,9 @@ meetings around the world./li
 and poisoning attacks./li
   /ul
 /li
-liBuild our pluggable transport combiner, that chains several
-transports together to take advantage of orthogonal types of blocking
-resistance./li
+liFinish and release our pluggable transport combiner, that chains
+several transports together to take advantage of orthogonal types of
+blocking resistance./li
 liImprove the UX for selecting the appropriate pluggable transport in
 the new Tor Browser, whilst maintaining user security./li
 liImplement a new pluggable transport that resists blocking in a



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] update osx instructions (#14449)

2015-02-08 Thread sebastian
commit 47671a81fed67d783c0d7683cd97f6dbb348a42b
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 17:06:07 2015 +0100

update osx instructions (#14449)
---
 projects/en/torbrowser.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index b6dd29a..95ae518 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -515,8 +515,8 @@
   div class=macosx box
 div class=pjtitleh2Mac OS X Instructions/h2/div
 div class=pjtext
-  pDownload the file above, save it somewhere, then click on it,
-  add the .dmg file inside your Applications folder and you will 
+  pDownload the file above, save it somewhere, then click on it.
+  This opens the .dmg file. Drag the included file into your Applications 
folder and you will
   have a Tor Browser application in your chosen language that you
   can pin on your Dock./p
 /div



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Remove vidalia-related docs and downloads

2015-02-08 Thread sebastian
commit c261c7ec855eea8029a7655ffe9f7ca255d921ce
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 17:55:35 2015 +0100

Remove vidalia-related docs and downloads

The downloads are horribly outdated, the docs are confusing and long.
Without a proper Vidalia maintainer and someone making packages, this
has no future.
---
 .gitignore  |3 -
 .htaccess   |4 -
 about/en/contributors.wml   |7 +-
 docs/en/bridges.wml |9 +-
 docs/en/debian-vidalia.wml  |  138 ---
 docs/en/faq.wml |  102 ---
 docs/en/proxychain.wml  |   55 
 docs/en/sidenav.wmi |3 -
 docs/en/signing-keys.wml|4 +-
 docs/en/tor-doc-osx.wml |4 +-
 docs/en/tor-doc-relay.wml   |   15 +---
 docs/torbutton/en/sidenav.wmi   |6 --
 download/en/download.wml|   39 -
 getinvolved/en/open-positions.wml   |2 +-
 getinvolved/en/translation-overview.wml |4 +-
 getinvolved/en/volunteer.wml|   29 +--
 images/vidalia-proxy.png|  Bin 46810 - 0 bytes
 include/versions.wmi|   38 -
 projects/en/vidalia.wml |  138 ---
 19 files changed, 35 insertions(+), 565 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e06ffa..8b45d74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ about/volunteers.html.en
 docs/N900.html.en
 docs/android.html.en
 docs/bridges.html.en
-docs/debian-vidalia.html.en
 docs/debian.html.en
 docs/documentation.html.en
 docs/faq-abuse.html.en
@@ -33,7 +32,6 @@ docs/hidden-services.html.en
 docs/installguide.html.en
 docs/manual.html.en
 docs/pluggable-transports.html.en
-docs/proxychain.html.en
 docs/rpms.html.en
 docs/running-a-mirror.html.en
 docs/short-user-manual.html.en
@@ -91,7 +89,6 @@ projects/torbrowser-details.html.en
 projects/torbrowser.html.en
 projects/tordnsel.html.en
 projects/torweather.html.en
-projects/vidalia.html.en
 torbutton/index.html.en
 torbutton/torbutton-faq.html.en
 torbutton/torbutton-options.html.en
diff --git a/.htaccess b/.htaccess
index e383041..6cdca66 100644
--- a/.htaccess
+++ b/.htaccess
@@ -23,10 +23,6 @@ RewriteRule ^tordnsel/dist/(.*) /dist/tordnsel/$1 [R=301,L]
 # Overview
 RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
 
-# Vidalia
-RewriteRule ^vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
-RewriteRule ^vidalia(.*) /projects/vidalia [R=301,L]
-
 # Press
 RewriteRule ^press/$ /press/press [R=301,L]
 RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index 0eda905..7308b35 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -40,7 +40,7 @@ in Tor's early days./dd
 Polipo to Windows.  He currently helps with the libevent
 bufferevent code./dd
 dtMatt Edman/dt
-ddOriginal developer for a href=page projects/vidaliaVidalia/a,
+ddOriginal developer for Vidalia,
 a cross-platform Tor Graphical User Interface included in the bundles./dd
 dtGeoff Goodell/dtddStarted the a
 href=https://svn.torproject.org/svn/blossom/trunk/;Blossom project/a
@@ -91,12 +91,11 @@ href=http://p56soo2ibjkx23xo.onion/;TorDNSEL 
code/a./dd
 dtTomás Touceda, Vidalia Developer/dt
 ddWorked on maintenance and new development for Vidalia./dd
 dtStephen Tyree/dtdd Worked during Google Summer of Code 2009 to
-develop a plugin API for a href=page projects/vidaliaVidalia/a
+develop a plugin API for Vidalia
 and create a plugin to allow HerdictWeb integration, a project aiming
 at identifying website inaccessibility using user submissions./dd
 dtCamilo Viecco/dtdd Worked on
-Providing Blossom functionality to Vidalia (a
-href=http://trac.vidalia-project.net/browser/vidalia/branches/exit-country;svn/a)
 as part of Google Summer of Code 2008./dd
+Providing Blossom functionality to Vidalia as part of Google Summer of Code 
2008./dd
 dtFred von Lohmann/dtddFred served on our Board of Directors
 from 2006 through 2009./dd
 dtShondoit Walker, Build Developer/dt
diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml
index dd46d43..7403235 100644
--- a/docs/en/bridges.wml
+++ b/docs/en/bridges.wml
@@ -327,9 +327,6 @@
 BridgeRelay 1
 Exitpolicy reject *:*
 /code/pre/li
-lia href=page docs/tor-doc-relayor using Vidalia/a:br
-img src=$(IMGROOT)/vidalia-bridges-setup.png alt=Vidalia's Sharing
-settings page/li
 /ul
 /p
 
@@ -346,10 +343,8 @@
 
 p
 Your bridge relay will automatically publish its address to the bridge
-authority, which will give it out via https or email as above. You can
-also tell a user about your bridge directly: if you're using Vidalia,
-you can copy-and-paste the bridge address from the Settings

[tor-commits] [webwml/staging] Remove Vidalia more thoroughly

2015-02-08 Thread sebastian
commit 214787960292c938d2e6f02e5d61bd33b4e57cb5
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 18:03:04 2015 +0100

Remove Vidalia more thoroughly
---
 docs/en/trademark-faq.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/trademark-faq.wml b/docs/en/trademark-faq.wml
index e51732b..6dea01d 100644
--- a/docs/en/trademark-faq.wml
+++ b/docs/en/trademark-faq.wml
@@ -118,7 +118,7 @@
 ul
 lia href=https://tails.boum.org/;The Amnesic Incognito Live
 System/a/li
-lia href=page projects/vidaliaVidalia/a/li
+liVidalia/li
 /ul
   /div
   !-- END MAINCOL --

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Add open graph meta tag

2015-02-08 Thread sebastian
commit e742616dda8b78e53b9a72c3aba06bb01a7dddb1
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 17:14:19 2015 +0100

Add open graph meta tag
---
 include/head.wmi |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/head.wmi b/include/head.wmi
index 78e422a..321658c 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -15,17 +15,18 @@
meta name=viewport content=width=device-width, initial-scale=1
meta name=author content=The Tor Project, Inc.
meta name=keywords content=anonymity online, tor, tor project, 
censorship circumvention, traffic analysis, anonymous communications research
- 
+   meta property=og:image 
content=https://www.torproject.org/images/tor-logo.jpg;
+
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.css 
rel=stylesheet
- 
+
#link href=css/master.css rel=stylesheet
!--[if lte IE 8]
link href=$(DOCROOT)/css/ie8-and-down.css rel=stylesheet



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Remove vidalia-related docs and downloads

2015-02-08 Thread sebastian
commit c261c7ec855eea8029a7655ffe9f7ca255d921ce
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 17:55:35 2015 +0100

Remove vidalia-related docs and downloads

The downloads are horribly outdated, the docs are confusing and long.
Without a proper Vidalia maintainer and someone making packages, this
has no future.
---
 .gitignore  |3 -
 .htaccess   |4 -
 about/en/contributors.wml   |7 +-
 docs/en/bridges.wml |9 +-
 docs/en/debian-vidalia.wml  |  138 ---
 docs/en/faq.wml |  102 ---
 docs/en/proxychain.wml  |   55 
 docs/en/sidenav.wmi |3 -
 docs/en/signing-keys.wml|4 +-
 docs/en/tor-doc-osx.wml |4 +-
 docs/en/tor-doc-relay.wml   |   15 +---
 docs/torbutton/en/sidenav.wmi   |6 --
 download/en/download.wml|   39 -
 getinvolved/en/open-positions.wml   |2 +-
 getinvolved/en/translation-overview.wml |4 +-
 getinvolved/en/volunteer.wml|   29 +--
 images/vidalia-proxy.png|  Bin 46810 - 0 bytes
 include/versions.wmi|   38 -
 projects/en/vidalia.wml |  138 ---
 19 files changed, 35 insertions(+), 565 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1e06ffa..8b45d74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,6 @@ about/volunteers.html.en
 docs/N900.html.en
 docs/android.html.en
 docs/bridges.html.en
-docs/debian-vidalia.html.en
 docs/debian.html.en
 docs/documentation.html.en
 docs/faq-abuse.html.en
@@ -33,7 +32,6 @@ docs/hidden-services.html.en
 docs/installguide.html.en
 docs/manual.html.en
 docs/pluggable-transports.html.en
-docs/proxychain.html.en
 docs/rpms.html.en
 docs/running-a-mirror.html.en
 docs/short-user-manual.html.en
@@ -91,7 +89,6 @@ projects/torbrowser-details.html.en
 projects/torbrowser.html.en
 projects/tordnsel.html.en
 projects/torweather.html.en
-projects/vidalia.html.en
 torbutton/index.html.en
 torbutton/torbutton-faq.html.en
 torbutton/torbutton-options.html.en
diff --git a/.htaccess b/.htaccess
index e383041..6cdca66 100644
--- a/.htaccess
+++ b/.htaccess
@@ -23,10 +23,6 @@ RewriteRule ^tordnsel/dist/(.*) /dist/tordnsel/$1 [R=301,L]
 # Overview
 RewriteRule ^overview(.*) /about/overview$1 [R=301,L]
 
-# Vidalia
-RewriteRule ^vidalia/dist/(.*) /dist/vidalia/$1 [R=301,L]
-RewriteRule ^vidalia(.*) /projects/vidalia [R=301,L]
-
 # Press
 RewriteRule ^press/$ /press/press [R=301,L]
 RewriteRule ^press/index.html(.*) /press/press.html$1 [R=301,L]
diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index 0eda905..7308b35 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -40,7 +40,7 @@ in Tor's early days./dd
 Polipo to Windows.  He currently helps with the libevent
 bufferevent code./dd
 dtMatt Edman/dt
-ddOriginal developer for a href=page projects/vidaliaVidalia/a,
+ddOriginal developer for Vidalia,
 a cross-platform Tor Graphical User Interface included in the bundles./dd
 dtGeoff Goodell/dtddStarted the a
 href=https://svn.torproject.org/svn/blossom/trunk/;Blossom project/a
@@ -91,12 +91,11 @@ href=http://p56soo2ibjkx23xo.onion/;TorDNSEL 
code/a./dd
 dtTomás Touceda, Vidalia Developer/dt
 ddWorked on maintenance and new development for Vidalia./dd
 dtStephen Tyree/dtdd Worked during Google Summer of Code 2009 to
-develop a plugin API for a href=page projects/vidaliaVidalia/a
+develop a plugin API for Vidalia
 and create a plugin to allow HerdictWeb integration, a project aiming
 at identifying website inaccessibility using user submissions./dd
 dtCamilo Viecco/dtdd Worked on
-Providing Blossom functionality to Vidalia (a
-href=http://trac.vidalia-project.net/browser/vidalia/branches/exit-country;svn/a)
 as part of Google Summer of Code 2008./dd
+Providing Blossom functionality to Vidalia as part of Google Summer of Code 
2008./dd
 dtFred von Lohmann/dtddFred served on our Board of Directors
 from 2006 through 2009./dd
 dtShondoit Walker, Build Developer/dt
diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml
index dd46d43..7403235 100644
--- a/docs/en/bridges.wml
+++ b/docs/en/bridges.wml
@@ -327,9 +327,6 @@
 BridgeRelay 1
 Exitpolicy reject *:*
 /code/pre/li
-lia href=page docs/tor-doc-relayor using Vidalia/a:br
-img src=$(IMGROOT)/vidalia-bridges-setup.png alt=Vidalia's Sharing
-settings page/li
 /ul
 /p
 
@@ -346,10 +343,8 @@
 
 p
 Your bridge relay will automatically publish its address to the bridge
-authority, which will give it out via https or email as above. You can
-also tell a user about your bridge directly: if you're using Vidalia,
-you can copy-and-paste the bridge address from the Settings

[tor-commits] [webwml/master] Remove Vidalia more thoroughly

2015-02-08 Thread sebastian
commit 214787960292c938d2e6f02e5d61bd33b4e57cb5
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 18:03:04 2015 +0100

Remove Vidalia more thoroughly
---
 docs/en/trademark-faq.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/trademark-faq.wml b/docs/en/trademark-faq.wml
index e51732b..6dea01d 100644
--- a/docs/en/trademark-faq.wml
+++ b/docs/en/trademark-faq.wml
@@ -118,7 +118,7 @@
 ul
 lia href=https://tails.boum.org/;The Amnesic Incognito Live
 System/a/li
-lia href=page projects/vidaliaVidalia/a/li
+liVidalia/li
 /ul
   /div
   !-- END MAINCOL --

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] update osx instructions (#14449)

2015-02-08 Thread sebastian
commit 47671a81fed67d783c0d7683cd97f6dbb348a42b
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 17:06:07 2015 +0100

update osx instructions (#14449)
---
 projects/en/torbrowser.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index b6dd29a..95ae518 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -515,8 +515,8 @@
   div class=macosx box
 div class=pjtitleh2Mac OS X Instructions/h2/div
 div class=pjtext
-  pDownload the file above, save it somewhere, then click on it,
-  add the .dmg file inside your Applications folder and you will 
+  pDownload the file above, save it somewhere, then click on it.
+  This opens the .dmg file. Drag the included file into your Applications 
folder and you will
   have a Tor Browser application in your chosen language that you
   can pin on your Dock./p
 /div

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] update the sponsors page for 2015

2015-02-08 Thread sebastian
commit 7eebbed30aafc93251c5278245b6e30a6c61b130
Author: Roger Dingledine a...@torproject.org
Date:   Sun Feb 8 01:41:18 2015 -0500

update the sponsors page for 2015
---
 about/en/sponsors.wml |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index 8163e2d..782fcae 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -23,14 +23,13 @@
 Tor network.
 /p
 
-h3Active Sponsors in 2014:/h3
+h3Active Sponsors in 2015:/h3
   ul
- lia href=http://www.sri.com/;SRI International/a 
(2011-2014)/li
- lia href=http://www.state.gov/j/drl/;US Department of State 
Bureau of Democracy, Human Rights, and Labor/a (2013-2015)/li
- lia href=http://nsf.gov/;National Science Foundation/a joint 
with Georgia Tech and Princeton University (2012-2016)/li
  lia href=http://www.rfa.org/english/;Radio Free Asia/a 
(2012-2014)/li
+ lia href=http://nsf.gov/;National Science Foundation/a joint 
with Georgia Tech and Princeton University (2012-2016)/li
+ lia href=http://www.sri.com/;SRI International/a 
(2011-2015)/li
+ lia href=http://www.state.gov/j/drl/;US Department of State 
Bureau of Democracy, Human Rights, and Labor/a (2013-2015)/li
  liAn anonymous North American ISP (2009-present)/li
- lia href=http://www.fordfoundation.org/;The Ford Foundation/a 
(2013-2014)/li
  lia href=http://code.google.com/soc/;Google Summer of Code/a 
(2007-present)/li
  lia href=page donate/donateMore than 4,300 personal donations 
from individuals like you/a (2006-present)/li
   /ul
@@ -39,6 +38,7 @@
 pWe greatly appreciate the support provided by our past sponsors
 in keeping the Tor Project progressing through our ambitious goals:/p
ul
+ lia href=http://www.fordfoundation.org/;The Ford Foundation/a 
(2013-2014)/li
  lia href=https://disconnect.me/;Disconnect/a (2014)/li
  lia href=https://freedom.press/;Freedom of the Press 
Foundation/a (2014)/li
  lia href=http://www.knightfoundation.org/;The Knight 
Foundation/a (2012-2013)/li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Hide 'Orbot Android VPN' project

2015-02-08 Thread sebastian
commit ee46b95852b84bde2a4ba616d1f6e6b7f6f2066d
Author: Damian Johnson ata...@torproject.org
Date:   Fri Feb 6 08:00:51 2015 -0800

Hide 'Orbot Android VPN' project

Nathan is unavailable to mentor this year. He's gonna check to see if 
there's
someone else from Guardian who would care to take on a student.
---
 getinvolved/en/volunteer.wml |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index d1ea4b4..fd26638 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -487,11 +487,6 @@ meetings around the world./li
 date with all changes in Android and mobile threats.
 /p
 
-p
-bProject Ideas:/bbr /
-ia href=#orbotVPNOrbot Android VPN/a/ibr /
-/p
-
 a id=project-tails/a
 h3a href=https://tails.boum.org/;The Amnesic Incognito Live 
System/a (a
 href=https://git-tails.immerda.ch/tails/;code/a, a
@@ -1220,6 +1215,7 @@ information see ticket 7416./a/b
 /p
 /li
 
+!--
 a id=orbotVPN/a
 li
 bOrbot Android VPN/b
@@ -1266,6 +1262,7 @@ exiting Tor software can be used with various transparent 
proxying
 configurations is a good first step to understanding this problem.
 /p
 /li
+--
 
 a id=improveTorTestCoverage/a
 li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Merge branch 'staging'

2015-02-08 Thread sebastian
commit dc63fc86127010eb3a1c687b0a8f3322bd067116
Merge: 63b2d91 2e30e55
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 04:28:56 2015 +0100

Merge branch 'staging'

 docs/en/verifying-signatures.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] acknowledge a second nsf grant, and fix the drl date

2015-02-08 Thread sebastian
commit 259379d4d59bb86db19f5ad78e81a63d8e0a867b
Author: Roger Dingledine a...@torproject.org
Date:   Sun Feb 8 02:19:55 2015 -0500

acknowledge a second nsf grant, and fix the drl date
---
 about/en/sponsors.wml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index 782fcae..1c77eb5 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -27,8 +27,9 @@
   ul
  lia href=http://www.rfa.org/english/;Radio Free Asia/a 
(2012-2014)/li
  lia href=http://nsf.gov/;National Science Foundation/a joint 
with Georgia Tech and Princeton University (2012-2016)/li
+ lia href=http://nsf.gov/;National Science Foundation/a via 
University of Minnesota (2013-2017)/li
  lia href=http://www.sri.com/;SRI International/a 
(2011-2015)/li
- lia href=http://www.state.gov/j/drl/;US Department of State 
Bureau of Democracy, Human Rights, and Labor/a (2013-2015)/li
+ lia href=http://www.state.gov/j/drl/;US Department of State 
Bureau of Democracy, Human Rights, and Labor/a (2013-2016)/li
  liAn anonymous North American ISP (2009-present)/li
  lia href=http://code.google.com/soc/;Google Summer of Code/a 
(2007-present)/li
  lia href=page donate/donateMore than 4,300 personal donations 
from individuals like you/a (2006-present)/li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Add open graph meta tag

2015-02-08 Thread sebastian
commit e742616dda8b78e53b9a72c3aba06bb01a7dddb1
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 17:14:19 2015 +0100

Add open graph meta tag
---
 include/head.wmi |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/head.wmi b/include/head.wmi
index 78e422a..321658c 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -15,17 +15,18 @@
meta name=viewport content=width=device-width, initial-scale=1
meta name=author content=The Tor Project, Inc.
meta name=keywords content=anonymity online, tor, tor project, 
censorship circumvention, traffic analysis, anonymous communications research
- 
+   meta property=og:image 
content=https://www.torproject.org/images/tor-logo.jpg;
+
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.css 
rel=stylesheet
- 
+
#link href=css/master.css rel=stylesheet
!--[if lte IE 8]
link href=$(DOCROOT)/css/ie8-and-down.css rel=stylesheet



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Add Yawning as a prospective mentor of UDP transports

2015-02-08 Thread sebastian
commit 63b2d91a28ea4ec0d5794c371c2e96ba5484a0a2
Author: Damian Johnson ata...@torproject.org
Date:   Sat Feb 7 11:07:50 2015 -0800

Add Yawning as a prospective mentor of UDP transports
---
 getinvolved/en/volunteer.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index ddf479a..34dedf8 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1059,7 +1059,7 @@ meetings around the world./li
 br
 Skill Level: iHigh/i
 br
-Likely Mentors: iSteven (sjmurdoch)/i
+Likely Mentors: iSteven (sjmurdoch), Yawning/i
 p
 There are a
 
href=https://research.torproject.org/techreports/datagram-comparison-2011-11-07.pdf;lots



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Add note about security issues

2015-02-08 Thread sebastian
commit 6f1225fc6c52b172e33de1cc11e3780f82e55abc
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 18:27:53 2015 +0100

Add note about security issues
---
 about/en/contact.wml |   10 ++
 1 file changed, 10 insertions(+)

diff --git a/about/en/contact.wml b/about/en/contact.wml
index e1e1d6c..e7d6c2c 100644
--- a/about/en/contact.wml
+++ b/about/en/contact.wml
@@ -19,6 +19,7 @@
 lia href=#twitterTwitter/a/li
 lia href=#phoneTelephone/a/li
 lia href=#mailMailing Address/a/li
+lia href=#securitySecurity Issues/a/li
 /ul
 
 a id=support/a
@@ -105,6 +106,15 @@
  Cambridge, MA 02139-2403 USA/p
 /p
 
+a id=security/a
+h3a class=anchor href=#securitySecurity Issues/a/h3
+pIf you found a security issue in one of our projects or our
+infrastructure, please email the respective maintainer. You can find
+their GPG fingerprint/key on our a
+href=https://db.torproject.org;developer ldap search page/a. Due
+to the many different projects we have, we do not offer a single
+list for security issues.
+
   /div
   !-- END MAINCOL --
   div id = sidecol

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Remove duplicated mission statement from become-sponsor

2015-02-08 Thread sebastian
commit 18965ae70eb6b896c4b08bcc9602d61f52cf6c5d
Author: Sebastian Hahn sebast...@torproject.org
Date:   Mon Feb 9 05:45:25 2015 +0100

Remove duplicated mission statement from become-sponsor
---
 donate/en/become-sponsor.wml |   13 -
 1 file changed, 13 deletions(-)

diff --git a/donate/en/become-sponsor.wml b/donate/en/become-sponsor.wml
index 888a12a..1d1bb18 100644
--- a/donate/en/become-sponsor.wml
+++ b/donate/en/become-sponsor.wml
@@ -23,19 +23,6 @@ through various a href=page 
about/sponsorssponsors/a.  Our
 a href=https://trac.torproject.org/projects/tor/wiki/org/sponsors;current 
list of projects/a is available.
 Please join us to further online anonymity!/p
 !-- bad sales pitch end --
-!-- mission statement start --
-h2Tor's Mission Statement is:/h2
-piThe Corporation is organized and shall be operated exclusively for
-scientific, charitable and educational purposes within the meaning
-of section 501(c)(3) of the Internal Revenue Code, including (a)
-to develop, improve and distribute free, publicly available tools
-and programs that promote free speech, free expression, civic
-engagement and privacy rights online; (b) to conduct scientific
-research regarding, and to promote the use of and knowledge about,
-such tools, programs and related issues around the world; (c) to
-educate the general public around the world about privacy rights
-and anonymity issues connected to Internet use./i/p
-!-- mission statement end --
   /div
   !-- END MAINCOL --
   div id = sidecol

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Nobody wants irix or mac os x 10.2 systems

2015-02-08 Thread sebastian
commit 0e965dd5b3d93a40592af34fc09953e6c612e7fd
Author: Sebastian Hahn sebast...@torproject.org
Date:   Mon Feb 9 05:54:11 2015 +0100

Nobody wants irix or mac os x 10.2 systems
---
 donate/en/donate-hardware.wml |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/donate/en/donate-hardware.wml b/donate/en/donate-hardware.wml
index e605dd2..6dbe35d 100644
--- a/donate/en/donate-hardware.wml
+++ b/donate/en/donate-hardware.wml
@@ -14,10 +14,9 @@
 that could be used to provide the infrastructure that supports
 Tor's operations, including website mirrors, database servers, build
 systems and legacy hardware for supporting packages on older Operating
-Systems; such as OS X 10.2, OS X 10.3, Windows XP, Windows 7, IRIX,
-Redhat, CentOS, Fedora, Debian, etc. A number of service providers
-have an abundance of bandwidth capacity, but need hardware in order
-to donate it to us./p
+Systems; Windows 7, Redhat, CentOS, Fedora, Debian, etc. A number of
+service providers have an abundance of bandwidth capacity, but need
+hardware in order to donate it to us./p
 
 pBy donating hardware, you're joining our many a href=page
 about/sponsorssponsors/a in providing online privacy and anonymity. If

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Merge branch 'staging'

2015-02-07 Thread sebastian
commit dc63fc86127010eb3a1c687b0a8f3322bd067116
Merge: 63b2d91 2e30e55
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Feb 8 04:28:56 2015 +0100

Merge branch 'staging'

 docs/en/verifying-signatures.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Fixes osx arch tag in TorBrowser's name.

2015-02-07 Thread sebastian
commit 2e30e5550a568b74d1b86eedd3bb445b39fa7839
Author: Sherief Alaa sheriefala...@gmail.com
Date:   Fri Feb 6 10:26:21 2015 +0200

Fixes osx arch tag in TorBrowser's name.
---
 docs/en/verifying-signatures.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index 84cda7e..856e01c 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -137,7 +137,7 @@
 to download the .asc file as well. Assuming you downloaded the
 package and its signature to your Desktop, run:/p
 
-pregpg --verify 
/Users/Alice/TorBrowser-version-torbrowserbundleosx32-osx-i386-en-US.dmg{.asc*,}/pre
+pregpg --verify 
/Users/Alice/TorBrowser-version-torbrowserbundleosx32-osx32_en-US.dmg{.asc*,}/pre
 
 pThe output should say Good signature: /p
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Revising project activity listings

2015-02-06 Thread sebastian
commit 4a7081c9ead9da649b8901368f7eeff044682d43
Author: Damian Johnson ata...@torproject.org
Date:   Tue Feb 3 08:27:59 2015 -0800

Revising project activity listings
---
 getinvolved/en/volunteer.wml |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 5fa81b6..4e8a7a8 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -168,7 +168,7 @@ meetings around the world./li
 tda href=#project-armArm/a/td
 tdUser Interface/td
 tdPython, Curses/td
-tdModerate/td
+tdLight/td
 tdatagar/td
   /tr
 
@@ -176,7 +176,7 @@ meetings around the world./li
 tda href=#project-orbotOrbot/a/td
 tdUser Interface/td
 tdJava/td
-tdLight/td
+tdModerage/td
 tdn8fr8/td
   /tr
 
@@ -224,7 +224,7 @@ meetings around the world./li
 tda href=#project-flash-proxyFlash Proxy/a/td
 tdClient Add-on/td
 tdPython, JavaScript, Go/td
-tdModerate/td
+tdLight/td
 tddcf, infinity0, Arlo Breault/td
   /tr
 
@@ -256,7 +256,7 @@ meetings around the world./li
 tda href=#project-tlsdateTlsdate/a/td
 tdUtility/td
 tdC/td
-tdHeavy/td
+tdLight/td
 tdioerror/td
   /tr
 
@@ -272,7 +272,7 @@ meetings around the world./li
 tda href=#project-atlasAtlas/a/td
 tdClient Service/td
 tdJavaScript/td
-tdLight/td
+tdNone/td
 td/td
   /tr
 
@@ -296,7 +296,7 @@ meetings around the world./li
 tda href=#project-onionooOnionoo/a/td
 tdBackend Service/td
 tdJava/td
-tdHeavy/td
+tdLight/td
 tdkarsten/td
   /tr
 
@@ -304,7 +304,7 @@ meetings around the world./li
 tda href=#project-doctorDocTor/a/td
 tdBackend Service/td
 tdPython/td
-tdLight/td
+tdNone/td
 tdatagar/td
   /tr
 
@@ -336,7 +336,7 @@ meetings around the world./li
 tda href=#project-bridgedbBridgeDB/a/td
 tdBackend Service/td
 tdPython/td
-tdNone/td
+tdHeavy/td
 tdisis/td
   /tr
 
@@ -344,7 +344,7 @@ meetings around the world./li
 tda href=#project-ooni-probeOoni Probe/a/td
 tdScanner/td
 tdPython/td
-tdHeavy/td
+tdLight/td
 tdhellais, aagbsn/td
   /tr
 
@@ -352,7 +352,7 @@ meetings around the world./li
 tda href=#project-torpsTorPS/a/td
 tdBackend Service/td
 tdPython/td
-tdLight/td
+tdNone/td
 tdAaron Johnson/td
   /tr
 
@@ -376,7 +376,7 @@ meetings around the world./li
 tda href=#project-tor2webTor2web/a/td
 tdClient Service/td
 tdPython/td
-tdNone/td
+tdLight/td
 tdevilaliv3, hellais/td
   /tr
 
@@ -384,7 +384,7 @@ meetings around the world./li
 tda href=#project-anonbibAnonbib/a/td
 tdWebsite/td
 tdPython/td
-tdModerate/td
+tdLight/td
 tdarma, nickm/td
   /tr
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] link to the windows exe new locations

2015-02-06 Thread sebastian
commit 5fd270f94a8a7ae991a950856a2b718803e7b9ff
Author: Roger Dingledine a...@torproject.org
Date:   Wed Jan 21 20:32:18 2015 -0500

link to the windows exe new locations

it is still unresolved how to automatically update the tor version
here when it changes inside the tor browser though.
---
 include/versions.wmi |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 6dcedb6..1184539 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -64,8 +64,8 @@
 define-tag version-androidbundle-libevent 
whitespace=deletelibevent-1.4.12-stable/define-tag
 define-tag package-androidbundle-alpha 
whitespace=deletedist/android/version-androidbundle-tor-orbot-version-androidbundle-orbot.apk/define-tag
 
-define-tag package-win32-stable 
whitespace=delete../dist/win32/tor-version-win32-stable-win32.exe/define-tag
-define-tag package-win32-alpha 
whitespace=delete../dist/win32/tor-version-win32-alpha-win32.exe/define-tag
+define-tag package-win32-stable 
whitespace=delete../dist/torbrowser/version-torbrowserbundledir/tor-win32-tor-version-win32-stable.zip/define-tag
+define-tag package-win32-alpha 
whitespace=delete../dist/torbrowser/version-torbrowserbundlebetadir/tor-win32-tor-version-win32-alpha.zip/define-tag
 
 define-tag file-win32-bundle-stable 
whitespace=deletevidalia-bundle-version-win32-bundle-stable-0.2.21.exe/define-tag
 define-tag package-win32-bundle-stable 
whitespace=delete../dist/vidalia-bundles/file-win32-bundle-stable/define-tag



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] update mirror tables with current status

2015-02-06 Thread sebastian
, TRUE, NO, http://torproject.nexiom.net, 
https://torproject.nexiom.net, , , http://torproject.nexiom.net, 
https://torproject.nexiom.net/dist, , , Tue Jan 20 19:17:52 2015
+Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, 
http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , 
http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, 
, , Tue Jan 20 19:17:52 2015
+EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, 
https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, 
, , Tue Jan 20 19:17:52 2015
+Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, 
https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, 
, , Wed Jan 21 15:15:41 2015
+Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, 
http://reichster.de/mirrors/torproject.org/, 
https://reichster.de/mirrors/torproject.org, , , 
http://reichster.de/mirrors/torproject.org/dist/, 
https://reichster.de/mirrors/torproject.org/dist/, , , Tue Jan 20 19:17:52 2015
+jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, 
http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , 
Tue Jan 20 19:17:52 2015
+tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, 
http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, 
https://tor.miglix.eu/dist/, , , Tue Jan 20 19:17:52 2015
 tor TA ninurta TOD name, TorNinurtaName, AT, Austria, AT, TRUE, TRUE, no, 
http://tor.ninurta.name/, , , , http://tor.ninurta.name/dist/, , , , Wed Oct 22 
21:02:17 2014
-fr33tux AT general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, 
TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , 
http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Thu Jan  8 
02:14:18 2015
-sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, 
FALSE, No, http://tor.iv.net.pl, https://tor.iv.net.pl, , , 
http://tor.iv.net.pl/dist/, https://tor.iv.net.pl/dist/, , , Thu Jan  8 
02:14:18 2015
-tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, 
http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, 
https://tor.static.lu/dist/, , , Thu Jan  8 02:14:18 2015
-t...@moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, 
No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , 
, http://www.moparisthebest.com/tor/dist/, 
https://www.moparisthebest.com/tor/dist/, , , Thu Jan  8 02:14:18 2015
-Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, 
http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Thu Jan  8 
02:14:18 2015
-rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, 
http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, 
https://ayo.tl/tor/dist/, , , Thu Jan  8 02:14:18 2015
-stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, 
FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , 
Thu Jan  8 05:01:06 2015
-Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, 
http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Jan  7 
18:27:42 2015
+fr33tux AT general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, 
TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , 
http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Tue Jan 20 
19:17:52 2015
+sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, 
FALSE, No, http://tor.iv.net.pl, https://tor.iv.net.pl, , , 
http://tor.iv.net.pl/dist/, https://tor.iv.net.pl/dist/, , , Wed Jan 21 
15:15:41 2015
+tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, 
http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, 
https://tor.static.lu/dist/, , , Tue Jan 20 19:17:52 2015
+t...@moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, 
No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , 
, http://www.moparisthebest.com/tor/dist/, 
https://www.moparisthebest.com/tor/dist/, , , Tue Jan 20 19:17:52 2015
+Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, 
http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Tue Jan 20 
19:17:52 2015
+rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, 
http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, 
https://ayo.tl/tor/dist/, , , Tue Jan 20 19:17:52 2015
+stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, 
FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , 
Tue Jan 20 19:17:52 2015
+Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, 
http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Tue Jan 20 
19:17:52 2015
 webmaster[at]hackabit.nl

[tor-commits] [webwml/staging] Drop project ideas done by successful students last year

2015-02-06 Thread sebastian
commit 8668ed13589e30251afc27a090f64c2e206660f1
Author: Damian Johnson ata...@torproject.org
Date:   Tue Feb 3 08:13:57 2015 -0800

Drop project ideas done by successful students last year

There's a few projects like 'tor daemon optimization' which I'm unsure if it
maps to something on this page. Just dropping the entries clearly the focus 
of
students we passed last year.
---
 getinvolved/en/volunteer.wml |  231 --
 1 file changed, 231 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 8b9c7fb..5fa81b6 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -413,7 +413,6 @@ meetings around the world./li
 ia href=#improveTorTestCoverageImprove test coverage in 
Tor/a/ibr /
 ia href=#useMoreCoresHave the Tor daemon use more cores/a/ibr /
 ia href=#improveHiddenServicesHelp improve Tor hidden 
services/a/ibr /
-ia href=#consensusDiffsImplement consensus diffs/a/ibr /
 ia href=#improvedDnsSupportImproved DNS support for Tor/a/ibr /
 ia href=#torSandboxingHelp improve Tor sandboxing/a/i
 /p
@@ -491,7 +490,6 @@ meetings around the world./li
 p
 bProject Ideas:/bbr /
 ia href=#orbotVPNOrbot Android VPN/a/ibr /
-ia href=#orfoxOrfox - Firefox/Gecko-based Android Browser for 
Tor/a/i
 /p
 
 a id=project-tails/a
@@ -724,11 +722,6 @@ meetings around the world./li
 in early 2011.
 /p
 
-p
-bProject Ideas:/bbr /
-ia href=#rewriteWeatherRewrite Tor Weather/a/ibr /
-/p
-
 a id=project-gettor/a
 h3a 
href=https://trac.torproject.org/projects/tor/wiki/org/roadmaps/GetTor;GetTor/a
 (a
 href=https://gitweb.torproject.org/gettor.git;code/a, a
@@ -740,11 +733,6 @@ meetings around the world./li
 relatively unchanged for quite a while.
 /p
 
-p
-bProject Ideas:/bbr /
-ia href=#revamp_gettorRevamp GetTor/a/i
-/p
-
 a id=project-torcheck/a
 h3a 
href=https://trac.torproject.org/projects/tor/wiki/org/roadmaps/TorCheck;TorCheck/a
 (a
 href=https://gitweb.torproject.org/check.git;code/a, a
@@ -1068,35 +1056,6 @@ meetings around the world./li
 /b
 /p
 
-a id=hsSearchEngine/a
-li
-bSearch Engine for Hidden Services/b
-br
-Effort Level: iMedium/i
-br
-Skill Level: iMedium/i
-br
-Likely Mentors: iGeorge (asn)/i
-p
-This project involves researching and developing a search engine for
-Hidden Services.
-/p
-
-p
-The student is expected to develop a search engine that can index
-hidden services and reply to search queries. The student should also
-develop a crawler that can search both clear web and hidden service
-websites to find more addresses. The student is expected to use and
-improve already existing search engine frameworks (e.g. YaCy), and not
-reinvent the wheel when it's possible.
-/p
-
-p
-The student should have a decent understanding of how search engines
-work, what algorithms they use, and of any related open source tools
-that are currently available.
-/p
-
 a id=profileUDPTransport/a
 li
 bProfile UDP transport protocols/b
@@ -1301,60 +1260,6 @@ configurations is a good first step to understanding 
this problem.
 /p
 /li
 
-a id=orfox/a
-li
-bOrfox - Firefox/Gecko-based Android Browser for Tor/b
-br
-Effort Level: iHigh/i
-br
-Skill Level: iMedium/i
-br
-Likely Mentors: iNathan (n8fr8)/i
-p
-With almost 1 million downloads, our Orweb browser has been a popular
-solution for easily accessing the web via Tor or any other HTTP or
-SOCKS proxy, while also ensuring local data caches are cleared and
-cookies are properly managed. Orweb is based on WebView, which has its
-limitations unfortunately. We would like to move to a
-Firefox/Fennec/GeckoView based browser, and have created a prototype
-for it. Mozilla has begun releasing GeckoView as a standalone
-component, as well, but it needs more testing, debugging and work on
-integration into our streamlined browser app model. Our end goal is to
-have a mobile browser that matches Tor Browser in terms of privacy
-enhancing features and security.
-/p
-
-p
-The deliverables for the project are expected to be the creation of a
-alpha quality release of Orfox, a GeckoView-based browser with feature
-parity of Orweb browser. A bonus goal is to implement additional
-features and capabilities based on Tor Browser patches for
-Fennec/Mozilla core. Finally, as always, a required activity is a
-network audit testing of implemented solution with write-ups, reports
-posted publicly.
-/p
-
-p
-Useful links to review:
-/p
-
-ul
-  lia href=https://github.com/guardianproject/orfox;Orfox (gecko 
prototype)/a/li
-  lia href=https://github.com/guardianproject/orweb;Orweb (production 
browser on WebView)/a/li
-  lia 

[tor-commits] [webwml/staging] Add disconnect to the sponsors page

2015-02-06 Thread sebastian
commit 77f279a9575b2b4f9b62338f7d9e72e04cd78438
Author: Andrew Lewman and...@torproject.is
Date:   Tue Jan 27 11:55:51 2015 -0500

Add disconnect to the sponsors page
---
 about/en/sponsors.wml |1 +
 1 file changed, 1 insertion(+)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index 576d5a2..8163e2d 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -39,6 +39,7 @@
 pWe greatly appreciate the support provided by our past sponsors
 in keeping the Tor Project progressing through our ambitious goals:/p
ul
+ lia href=https://disconnect.me/;Disconnect/a (2014)/li
  lia href=https://freedom.press/;Freedom of the Press 
Foundation/a (2014)/li
  lia href=http://www.knightfoundation.org/;The Knight 
Foundation/a (2012-2013)/li
   lia href=http://www.sida.se/English/;Sida - Swedish 
International Development Cooperation Agency/a (2010-2013)/li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Fixes osx arch tag in TorBrowser's name.

2015-02-06 Thread sebastian
commit 2e30e5550a568b74d1b86eedd3bb445b39fa7839
Author: Sherief Alaa sheriefala...@gmail.com
Date:   Fri Feb 6 10:26:21 2015 +0200

Fixes osx arch tag in TorBrowser's name.
---
 docs/en/verifying-signatures.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index 84cda7e..856e01c 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -137,7 +137,7 @@
 to download the .asc file as well. Assuming you downloaded the
 package and its signature to your Desktop, run:/p
 
-pregpg --verify 
/Users/Alice/TorBrowser-version-torbrowserbundleosx32-osx-i386-en-US.dmg{.asc*,}/pre
+pregpg --verify 
/Users/Alice/TorBrowser-version-torbrowserbundleosx32-osx32_en-US.dmg{.asc*,}/pre
 
 pThe output should say Good signature: /p
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Add David as a mentor for tor projects

2015-02-06 Thread sebastian
commit 186ff6fade2a7f2312b466bd3581681d22a08aec
Author: Damian Johnson ata...@torproject.org
Date:   Wed Feb 4 09:10:08 2015 -0800

Add David as a mentor for tor projects
---
 getinvolved/en/volunteer.wml |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index c687d94..d1ea4b4 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -950,7 +950,7 @@ meetings around the world./li
 br
 Skill Level: iMedium to High/i
 br
-Likely Mentors: iNick (nickm)/i
+Likely Mentors: iNick (nickm), David (dgoulet)/i
 p
 The Tor code is more than 10 years old in places, and we haven't always had
 enough time or wisdom to write things as well as we could have.  Our unit
@@ -1275,7 +1275,7 @@ configurations is a good first step to understanding this 
problem.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm)/i
+Likely Mentors: iNick (nickm), David (dgoulet)/i
 p
 Right now, our unit test coverage with the tests we ship is around 30%
 -- only 30% of the executable lines in our source are reached by the
@@ -1341,7 +1341,7 @@ easy to test.)
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm)/i
+Likely Mentors: iNick (nickm), David (dgoulet)/i
 p
 Right now, if you run a busy Tor server on a multicore computer, most of
 the cores are mostly unused.  We have a cpuworker mechanism to move
@@ -1391,7 +1391,7 @@ the codebase that you want to work on.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm)/i
+Likely Mentors: iNick (nickm), David (dgoulet)/i
 p
 We're working on a revamp of the entire Tor hidden service design to
 improve the security and reliability of the hidden service system.
@@ -1428,7 +1428,7 @@ the codebase that you want to work on.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm)/i
+Likely Mentors: iNick (nickm), David (dgoulet)/i
 p
 Right now, you can only use Tor's DNS support to look up IPv4 and IPv6
 addresses, and to fetch PTR records.  But DNS can do so much more!
@@ -1464,7 +1464,7 @@ the codebase that you want to work on.
 br
 Skill Level: iMedium/i
 br
-Likely Mentors: iNick (nickm)/i
+Likely Mentors: iNick (nickm), David (dgoulet)/i
 p
 The seccomp2 mechanism on Linux lets programs improve their robustness
 against unforseen bugs by running with restrictions on which system



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] PM position taken down.

2015-02-06 Thread sebastian
commit b9a6e81d6fa3abfb9563980f71de361b82558eed
Author: Nick Mathewson ni...@torproject.org
Date:   Mon Feb 2 15:39:29 2015 -0500

PM position taken down.
---
 about/en/jobs-projectmanager.wml |2 ++
 about/en/jobs.wml|   14 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/about/en/jobs-projectmanager.wml b/about/en/jobs-projectmanager.wml
index 4ecec03..fe5bb4e 100644
--- a/about/en/jobs-projectmanager.wml
+++ b/about/en/jobs-projectmanager.wml
@@ -11,6 +11,8 @@
   /div
div id=maincol
 h1The Tor Project is looking for a Project Manager!/h1
+h1Note: we've gotten enough applications for this position for now. Thank 
you!/h1
+
 
 p
 A project manager is the person who brings order to chaos. You will coordinate 
and help track
diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 05cdca4..5ffc56b 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -12,16 +12,12 @@
div id=maincol
 h1The Tor Project is always looking for more great people to join our 
team!/h1
 
-#pAt the moment, we don't have any official open positions. Please check back
-#soon, though! In the meantime, you may want to glance at our
-#a href=page getinvolved/volunteervolunteers/a page.
+pAt the moment, we don't have any official open positions. Please check back
+soon, though! In the meantime, you may want to glance at our
+a href=page getinvolved/volunteervolunteers/a page.
 
-pSpecifically, we're looking for the following people currently:
-/p
-
-ul
-lia href=page about/jobs-projectmanagerProject Manager/a/li
-/ul
+#pSpecifically, we're looking for the following people currently:
+#/p
 
 pIn the past, we looked for the following people:/p
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Preparation for GSoC 2015

2015-02-06 Thread sebastian
commit a0ab010c97f6227a89f0f509e43f7abbe29a04b8
Merge: 712458e b28b35f
Author: Damian Johnson ata...@torproject.org
Date:   Tue Feb 3 08:32:28 2015 -0800

Preparation for GSoC 2015

Org applications open in a bit less than a week so just taking a quick first
pass for our gsoc and volunteer pages. Next step gonna need to engage other
folks to update our project ideas...

 about/en/gsoc.wml|   13 ++-
 getinvolved/en/volunteer.wml |  255 ++
 2 files changed, 20 insertions(+), 248 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Notice on 'Develop a Censorship Analyzer' to make a contribution

2015-02-06 Thread sebastian
commit ce43dfb442549b760a2ffc618c98862d499d748c
Author: Damian Johnson ata...@torproject.org
Date:   Wed Feb 4 09:00:27 2015 -0800

Notice on 'Develop a Censorship Analyzer' to make a contribution

Addition requested by phw.
---
 getinvolved/en/volunteer.wml |7 +++
 1 file changed, 7 insertions(+)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 4e8a7a8..c687d94 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -1131,6 +1131,13 @@ mean getting familiar with a 
href=https://ooni.torproject.org;OONI/a and
 a href=http://twistedmatrix.com/trac/;Twisted/a. After that, the tool
 should be implemented as a number of OONI-specific networking tests.
 /p
+
+p
+Applicants should be familiar with Python and asynchronous programming,
+e.g., as it is used in Twisted.  As part of your application for this
+project please contribute a patch for a bug in a
+href=https://trac.torproject.org/projects/tor/query?status=!closedcomponent=Ooni;OONI/a.
+/p
 /li
 
 a id=makeTorbirdyBetter/a



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Updating GSoC page for 2015

2015-02-06 Thread sebastian
commit b28b35f6b1de8e46b3c3b7dda9ab309f4eab1dcb
Author: Damian Johnson ata...@torproject.org
Date:   Tue Feb 3 08:31:24 2015 -0800

Updating GSoC page for 2015

Minor update just like last year's.
---
 about/en/gsoc.wml |   13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/about/en/gsoc.wml b/about/en/gsoc.wml
index 2009eed..c9f53c0 100644
--- a/about/en/gsoc.wml
+++ b/about/en/gsoc.wml
@@ -2,23 +2,26 @@
 # Revision: $Revision$
 # Translation-Priority: 4-optional
 
-#include head.wmi TITLE=Tor: Google Summer of Code 2014 CHARSET=UTF-8
+#include head.wmi TITLE=Tor: Google Summer of Code 2015 CHARSET=UTF-8
 div id=content class=clearfix
   div id=breadcrumbs
 a href=page indexHome raquo; /a
 a href=page about/gsocGoogle Summer of Code/a
   /div
   div id=maincol 
-h2Tor: Google Summer of Code 2014/h2
+h2Tor: Google Summer of Code 2015/h2
 hr
 
 p
 The Tor Project, in collaboration with a href=https://www.eff.org/;The
 Electronic Frontier Foundation/a, have taken part in Google Summer of 
Code
-for 2007 through 2013, mentoring the total of 40 students. Now google has
+for 2007 through 2014, mentoring the total of 53 students.
+!--
+Now google has
 announced that we'll be taking part again for a
-href=https://www.google-melange.com/gsoc/homepage/google/gsoc2014;Google
-Summer of Code 2014/a!
+href=https://www.google-melange.com/gsoc/homepage/google/gsoc2015;Google
+Summer of Code 2015/a!
+--
 /p
 
 p



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] update mirror list

2015-02-06 Thread sebastian
commit deff9d99cbd6f89884d1e54122656c616ec4c449
Author: Andrew Lewman and...@torproject.is
Date:   Wed Jan 21 10:57:47 2015 -0500

update mirror list
---
 include/tor-mirrors.csv |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index 5d87dec..c92525b 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -24,7 +24,6 @@ info AT zentrum-der-gesundheit DOT de, Zentrum der 
Gesundheit, DK, Denmark, Euro
 info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, 
FALSE, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , 
http://btn6gqzqevlhoryd.onion, Thu Jan  8 02:14:18 2015
 Piratenpartei Bayern, Piratenpartei Bayern, DE, Germany, DE, TRUE, FALSE, NO, 
http://tormirror.piratenpartei-bayern.de, 
https://tormirror.piratenpartei-bayern.de, , , 
http://tormirror.piratenpartei-bayern.de/dist/, 
http://tormirror.piratenpartei-bayern.de/dist/, , , Wed Jan  7 18:27:42 2015
 Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, 
http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , 
http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.org/dist/, , , Thu Jan  
8 02:14:18 2015
-kevi...@pressfreedomfoundation.org, Freedom of the Press Foundation, US, 
United States, US, True, False, No, http://tor.pressfreedomfoundation.org, 
https://tor.pressfreedomfoundation.org, , , 
http://tor.pressfreedomfoundation.org/dist/, 
https://tor.pressfreedomfoundation.org/dist/, , , Wed Jan  7 18:27:42 2015
 t...@fodt.it // FoDT.it Webteam, FoDT.it, AT, Austria, Europe, TRUE, FALSE, 
No, http://tor.fodt.it, https://tor.fodt.it, , 
ftp://ftp.fodt.it/pub/mirrors/torproject.org/, http://tor.fodt.it/dist/, 
https://tor.fodt.it/dist/, , , Mon Aug 25 16:19:07 2014
 http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, 
http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Thu Jan  8 
02:14:18 2015
 haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, TRUE, No, 
http://tor.zilog.es/, https://tor.zilog.es/, , , http://tor.zilog.es/dist/, 
https://tor.zilog.es/dist/, , , Thu Jan  8 05:01:06 2015
@@ -106,3 +105,6 @@ mir...@xfree.com.ar, Xfree.com.ar, AR, Argentina, South 
America, TRUE, FALSE, No
 tor AT eprci NET, EPRCI, US, NH, US, TRUE, FALSE, No, http://tor.eprci.net/, 
https:/www.eprci.com/tor/, , , http://tor.eprci.net/dist/, 
https://www.eprci.com/tor/dist/, , , Wed Jan  7 18:27:42 2015
 cont...@mrtino.eu, Tor Supporter, FR, France, FR, TRUE, FALSE, No, 
http://tor.mrtino.eu http://tor.mrtino.eu/dist
 t...@kura.io,KURA IO 
LIMITED,NL,Netherlands,Europe,TRUE,TRUE,TRUE,http://tor-mirror.kura.io/,https://tor-mirror.kura.io/,rsync://tor-mirror.kura.io/torproject.org,ftp://tor-mirror.kura.io,http://tor-mirror.kura.io/dist/,https://tor-mirror.kura.io/dist/,rsync://tor-mirror.kura.io/torproject.org/dist,,
+tor-admin AT wardsback DOT org, wardsback.org, FR, France, FR, TRUE, FALSE, 
No, http://alliumcepa.wardsback.org/, , , , 
http://alliumcepa.wardsback.org/dist/, , , ,
+PW,PW,DE,Germany,DE,TRUE,TRUE,NO,http://tor.pw.is/,https://www.it-sicherheitschannel.de/,,,http://tor.pw.is/dist/,https://www.it-sicherheitschannel.de/dist/,,,
+kevin@freedom.press, Freedom of the Press Foundation, ,US, US, True, False, 
No, http://tor.freedom.press,https://tor.freedom.press, 
,http://tor.freedom.press/dist/,https://tor.freedom.press/dist/, , ,
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] disable the project manager post more thoroughly

2015-02-06 Thread sebastian
commit 712458e7edbe4d973f5711acf3e3f874bfa1c149
Author: Roger Dingledine a...@torproject.org
Date:   Tue Feb 3 02:17:03 2015 -0500

disable the project manager post more thoroughly
---
 about/en/sidenav.wmi |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/about/en/sidenav.wmi b/about/en/sidenav.wmi
index 3cc22a4..5816b57 100644
--- a/about/en/sidenav.wmi
+++ b/about/en/sidenav.wmi
@@ -43,10 +43,10 @@
 
   {'url'  = 'about/jobs',
'txt'  = 'Jobs',
-   'subelements' = [
-  {'url'  = 'about/jobs-projectmanager',
-   'txt'  = 'Project manager',
-  }]
+#   'subelements' = [
+#  {'url'  = 'about/jobs-projectmanager',
+#   'txt'  = 'Project manager',
+#  }]
   },
 
   {'url'  = 'about/sponsors',



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Update Torbrowser changelog link

2015-01-20 Thread sebastian
commit 95f6cfec4d7fa1676a555fb79e7a8b01edbc87c8
Author: Sebastian Hahn sebast...@torproject.org
Date:   Tue Jan 20 13:28:56 2015 +0100

Update Torbrowser changelog link
---
 projects/en/torbrowser.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 4055009..3a1fc50 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -604,8 +604,8 @@
   a
   href=https://www.torproject.org/projects/torbrowser/design/;design
   document/a, the a
-  
href=https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/refs/heads/maint-3.6:/Bundle-Data/Docs/ChangeLog.txt;ChangeLog
-  for the 3.6 branch/a, and the a
+  
href=https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt?h=maint-4.0;ChangeLog
+  for the 4.0 branch/a, and the a
   
href=https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt;ChangeLog
   for the alpha branch/a.
   /p

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Provide link for TB modification documents

2015-01-20 Thread sebastian
commit c88b90f2efbde47bd49702b00e8f0de37cc4fbea
Author: Sebastian Hahn sebast...@torproject.org
Date:   Tue Jan 20 13:37:13 2015 +0100

Provide link for TB modification documents
---
 projects/en/torbrowser.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 3a1fc50..b6dd29a 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -289,7 +289,7 @@
 pSee our instructions on a href=page docs/verifying-signatureshow to 
verify package signatures/a,
   which allows you to make sure you've downloaded the file we intended
   you to get. Also, note that the Firefox ESR in our bundles is
-  modified from the a
+  a href=https://gitweb.torproject.org/tor-browser.git;modified/a 
from the a
   href=https://www.mozilla.org/en-US/firefox/organizations/;default
   Firefox ESR/a/p
 !-- alpha bundles --

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Add recent articles and PR to press page

2015-01-20 Thread sebastian
commit 0a5f322605a040b3b195a8dd0677c0e3c816c262
Author: Matthew Finkel matthew.fin...@gmail.com
Date:   Tue Jan 20 01:46:01 2015 +

Add recent articles and PR to press page
---
 press/en/press.wml |   75 +++-
 1 file changed, 74 insertions(+), 1 deletion(-)

diff --git a/press/en/press.wml b/press/en/press.wml
index 756ae5a..0774f61 100644
--- a/press/en/press.wml
+++ b/press/en/press.wml
@@ -33,6 +33,77 @@ newest to oldest: /p
 /tr
 /thead
 tr style=background-color: #e5e5e5;
+td2015 Jan 7/td
+tdInside BitCoins/td
+tda
+href=http://insidebitcoins.com/news/developers-say-privacy-network-tor-was-not-compromised-during-silk-road-takedown/28469;Developers
+Say Privacy Network Tor Was Not Compromised During Silk Road Takedown/a/td
+/tr
+tr style=
+td2014 Dec 30/td
+td31C3/td
+tda
+href=http://media.ccc.de/browse/congress/2014/31c3_-_6251_-_en_-_saal_1_-_201412301400_-_state_of_the_onion_-_jacob_-_arma.html#video;“State
+of the Onion/a video on the state of the Tor Project with Roger
+Dingledine, Jacob Appelbaum, Arturo Filastò, and Laura Poitras./td
+/tr
+tr style=background-color: #e5e5e5;
+td2014 Dec 26/td
+tdEngadget/td
+tda
+href=http://www.engadget.com/2014/12/26/lizard-squad-hackers-attack-tor/;Band
+of hackers manages to take down Sony--but not Tor/a/td
+/tr
+tr style=
+td2014 Dec 19/td
+tdThe Guardian/td
+tda
+href=http://www.theguardian.com/technology/2014/dec/05/how-faceboook-tor-service-encourage-open-web;How
+Facebook's Tor service could encourage a more open web/a/td
+/tr
+tr style=background-color: #e5e5e5;
+td2014 Dec 17/td
+tdGizmodo/td
+tda
+href=http://gizmodo.com/tor-is-still-safe-1669011966;Tor is Still Safe
+/a/td
+/tr
+tr style=
+td2014 Dec 12/td
+tdThe Independent/td
+tda
+href=http://www.independent.co.uk/voices/comment/the-dark-web-is-not-just-for-paedophiles-drug-dealers-and-terrorists-9920667.html;OpEd
+/aon hidden services and censorship/td
+/tr
+tr style=background-color: #e5e5e5;
+td2014 Dec 11/td
+tdDCInno/td
+tda
+href=http://dcinno.streetwise.co/2014/11/11/mozilla-firefox-anonymous-internet-tor/;Firefox
+is Building an Anonymous Internet Browser With Tor/a via @DC_Inno/td
+/tr
+tr style=
+td2014 Nov 10/td
+tdGizmodo/td
+tda
+href=http://gizmodo.com/mozilla-is-helping-tor-get-bigger-and-better-1656860653;Mozilla
+get bigger and better/a/td
+/tr
+tr style=background-color: #e5e5e5;
+td2014 Nov 20/td
+tdWired.co.UK/td
+tda
+href=http://www.wired.co.uk/news/archive/2014-11/20/tor-still-secure;Don't
+panic, Tor is still safe and Here’s Why/a/td
+/tr
+tr style=
+td2014 Oct 31/td
+tdThe Next Web/td
+tda
+href=http://thenextweb.com/facebook/2014/10/31/facebook-now-available-tor-network/;Facebook
+is now available on Tor for more secure browsing/a/td
+/tr
+tr style=background-color: #e5e5e5;
 td2014 Jul 8/td
 tdCambridge Community Television/td
 tda href=http://www.cctvcambridge.org/NSATor;NSA Surveillance Targets 
Cambridge - based TOR Project/a/td
@@ -2047,7 +2118,9 @@ Traffic/a/td
 tr style=background-color: #e5e5e5;
 td2004 Aug 30/td
 tdNewsweek/td
-tdTechnology: Instant Security (no link)/td
+tda
+href=http://www.newsweek.com/technology-instant-security-126733;Technology:
+Instant Security/a/td
 /tr
 
 tr



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Bug 14304: Document stripping of MAR files

2015-01-20 Thread sebastian
commit 82fcda5832cbc098be5fe7b5ac55fb7cf68242ba
Author: Georg Koppen g...@torproject.org
Date:   Tue Jan 20 13:00:36 2015 +

Bug 14304: Document stripping of MAR files

We add a section explaining how to verify that the signed MAR files we
ship are essentially the ones our Gitian setup produced.
---
 docs/en/verifying-signatures.wml |   58 ++
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index b9eeb03..84cda7e 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -186,8 +186,8 @@
 h3a class=anchor href=#BuildVerification
 Verifying sha256sums (advanced)/a/h3
 hr
-pBuild reproducibility is a a 
-   
href=https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise;security
 
+pBuild reproducibility is a a
+   
href=https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise;security
property/a of Tor Browser 3.0 and later. Anyone can build
Tor Browser on their own machine and produce a binary that is
bit-for-bit identical to the binary we offer on the download page.
@@ -201,22 +201,22 @@
 
 ul
   liDownload the Tor Browser package, the sha256sums.txt file, and the
-  sha256sums signature files. They can all be found in the same directory 
+  sha256sums signature files. They can all be found in the same directory
   under a href=https://www.torproject.org/dist/torbrowser/;
-  https://www.torproject.org/dist/torbrowser//a, for example in '3.6.1' 
+  https://www.torproject.org/dist/torbrowser//a, for example in '3.6.1'
   for TBB 3.6.1./li
-  liRetrieve the signers' GPG keys. This can be done from the command 
-  line by entering something like 
+  liRetrieve the signers' GPG keys. This can be done from the command
+  line by entering something like
   pregpg --keyserver keys.mozilla.org --recv-keys 
0x29846B3C683686CC/pre
-  (This will bring you developer Mike Perry's public key. Other 
+  (This will bring you developer Mike Perry's public key. Other
   developers' key IDs can be found on
-  a href=page docs/signing-keysthis 
+  a href=page docs/signing-keysthis
   page/a.)/li
   liVerify the sha256sums.txt file by executing this command:
   pregpg --verify lt;NAME OF THE SIGNATURE FILEgt;.asc 
sha256sums.txt/pre/li
-  liYou should see a message like Good signature from lt;DEVELOPER 
+  liYou should see a message like Good signature from lt;DEVELOPER
   NAMEgt;. If you don't, there is a problem. Try these steps again./li
-  liNow you can take the sha256sum of the Tor Browser package. On 
+  liNow you can take the sha256sum of the Tor Browser package. On
   Windows you can use the a href=http://md5deep.sourceforge.net/;
   hashdeep utility/a and run
   preC:\location\where\you\saved\hashdeep -c sha256sum lt;TOR BROWSER 
FILE NAMEgt;.exe/pre
@@ -225,17 +225,39 @@
   liOpen sha256sums.txt in a text editor./li
   liLocate the name of the Tor Browser file you downloaded./li
   liCompare the string of letters and numbers to the left of your
-  filename with the string of letters and numbers that appeared 
-  on your command line. If they match, you've successfully verified the 
-  build./li 
+  filename with the string of letters and numbers that appeared
+  on your command line. If they match, you've successfully verified the
+  build./li
 /ul
-
-pa 
href=https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-signatures;Scripts/a
 
-to a 
href=http://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x;automate/a
 
-these steps have been written, but to use them you will need to modify 
+
+pa 
href=https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-signatures;Scripts/a
+to a 
href=http://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x;automate/a
+these steps have been written, but to use them you will need to modify
 them yourself with the latest Tor Browser filename./p
-
+
+hr
+
+a id=MARVerification/a
+h3a class=anchor href=#MARVerification
+Verifying MAR files we ship (advanced)/a/h3
 hr
+pStarting with Tor Browser 4.5a4 we sign our MAR files which helps
+securing our update process. The downside of this is the need for 
additional
+instructions to verify that the MAR files we ship are indeed the ones we
+produced with our Gitian setup./p
+
+pAssuming the verification happens on a Linux computer one first needs 
the
+ttmar-tools-linux*.zip/tt out of the ttgitian-builder/inputs/tt
+directory to remove the embedded signature(s). The steps to get the 
unsigned
+MAR file on a 64 bit Linux 

[tor-commits] [webwml/staging] Deprecate old TBB version

2015-01-20 Thread sebastian
commit f464a370f4fa70837f6db8d89013562791ff4d6d
Author: Georg Koppen g...@torproject.org
Date:   Mon Jan 19 12:30:50 2015 +

Deprecate old TBB version
---
 projects/torbrowser/RecommendedTBBVersions |4 
 1 file changed, 4 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 7cb0ac0..4a5eb92 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,10 +3,6 @@
 4.0.3-Linux,
 4.0.3-MacOS,
 4.0.3-Windows,
-4.5-alpha-2,
-4.5-alpha-2-Linux,
-4.5-alpha-2-MacOS,
-4.5-alpha-2-Windows
 4.5a3,
 4.5a3-Linux,
 4.5a3-MacOS,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Add new TBB version

2015-01-20 Thread sebastian
commit 07f661bf111532c8ee921133f4183e475dc6145a
Author: Georg Koppen g...@torproject.org
Date:   Mon Jan 19 09:55:51 2015 +

Add new TBB version
---
 include/versions.wmi   |   10 +-
 projects/torbrowser/RecommendedTBBVersions |4 
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 0075fef..24bc0be 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -24,10 +24,10 @@
 define-tag version-osx-ppc-alpha whitespace=delete0.2.4.17-rc/define-tag
 
 define-tag version-torbrowserbundledir whitespace=delete4.0.3/define-tag
-define-tag version-torbrowserbundlebetadir 
whitespace=delete4.5-alpha-2/define-tag
+define-tag version-torbrowserbundlebetadir 
whitespace=delete4.5a3/define-tag
 
 define-tag version-torbrowserbundle whitespace=delete4.0.3/define-tag
-define-tag version-torbrowserbundlebeta 
whitespace=delete4.5-alpha-2/define-tag
+define-tag version-torbrowserbundlebeta whitespace=delete4.5a3/define-tag
 define-tag version-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-torbrowser-tor-components 
whitespace=deletelibevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.1e/define-tag
 define-tag version-torbrowser-firefox whitespace=delete24.2.0esr/define-tag
@@ -39,8 +39,8 @@
 
 define-tag version-torbrowserbundlelinux32 
whitespace=delete4.0.3/define-tag
 define-tag version-torbrowserbundlelinux64 
whitespace=delete4.0.3/define-tag
-define-tag version-torbrowserbundlelinux32beta 
whitespace=delete4.5-alpha-2/define-tag
-define-tag version-torbrowserbundlelinux64beta 
whitespace=delete4.5-alpha-2/define-tag
+define-tag version-torbrowserbundlelinux32beta 
whitespace=delete4.5a3/define-tag
+define-tag version-torbrowserbundlelinux64beta 
whitespace=delete4.5a3/define-tag
 define-tag version-gnu-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-gnu-torbrowser-tor-components 
whitespace=deletelibevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.0k/define-tag
 define-tag version-gnu-torbrowser-firefox 
whitespace=delete24.2.0esr/define-tag
@@ -49,7 +49,7 @@
 
 define-tag version-torbrowserbundleosx32 whitespace=delete4.0.3/define-tag
 define-tag version-torbrowserbundleosx64 
whitespace=delete2.3.25-15/define-tag
-define-tag version-torbrowserbundleosx64beta 
whitespace=delete4.5-alpha-2/define-tag
+define-tag version-torbrowserbundleosx64beta 
whitespace=delete4.5a3/define-tag
 define-tag version-osx-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-osx-torbrowser-firefox 
whitespace=delete24.2.0esr/define-tag
 define-tag version-osx-torbrowser-torbutton 
whitespace=delete1.5.2/define-tag
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 4785612..7cb0ac0 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -7,4 +7,8 @@
 4.5-alpha-2-Linux,
 4.5-alpha-2-MacOS,
 4.5-alpha-2-Windows
+4.5a3,
+4.5a3-Linux,
+4.5a3-MacOS,
+4.5a3-Windows
 ]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Bug 14304: Document stripping of MAR files

2015-01-20 Thread sebastian
commit 82fcda5832cbc098be5fe7b5ac55fb7cf68242ba
Author: Georg Koppen g...@torproject.org
Date:   Tue Jan 20 13:00:36 2015 +

Bug 14304: Document stripping of MAR files

We add a section explaining how to verify that the signed MAR files we
ship are essentially the ones our Gitian setup produced.
---
 docs/en/verifying-signatures.wml |   58 ++
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index b9eeb03..84cda7e 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -186,8 +186,8 @@
 h3a class=anchor href=#BuildVerification
 Verifying sha256sums (advanced)/a/h3
 hr
-pBuild reproducibility is a a 
-   
href=https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise;security
 
+pBuild reproducibility is a a
+   
href=https://blog.torproject.org/blog/deterministic-builds-part-one-cyberwar-and-global-compromise;security
property/a of Tor Browser 3.0 and later. Anyone can build
Tor Browser on their own machine and produce a binary that is
bit-for-bit identical to the binary we offer on the download page.
@@ -201,22 +201,22 @@
 
 ul
   liDownload the Tor Browser package, the sha256sums.txt file, and the
-  sha256sums signature files. They can all be found in the same directory 
+  sha256sums signature files. They can all be found in the same directory
   under a href=https://www.torproject.org/dist/torbrowser/;
-  https://www.torproject.org/dist/torbrowser//a, for example in '3.6.1' 
+  https://www.torproject.org/dist/torbrowser//a, for example in '3.6.1'
   for TBB 3.6.1./li
-  liRetrieve the signers' GPG keys. This can be done from the command 
-  line by entering something like 
+  liRetrieve the signers' GPG keys. This can be done from the command
+  line by entering something like
   pregpg --keyserver keys.mozilla.org --recv-keys 
0x29846B3C683686CC/pre
-  (This will bring you developer Mike Perry's public key. Other 
+  (This will bring you developer Mike Perry's public key. Other
   developers' key IDs can be found on
-  a href=page docs/signing-keysthis 
+  a href=page docs/signing-keysthis
   page/a.)/li
   liVerify the sha256sums.txt file by executing this command:
   pregpg --verify lt;NAME OF THE SIGNATURE FILEgt;.asc 
sha256sums.txt/pre/li
-  liYou should see a message like Good signature from lt;DEVELOPER 
+  liYou should see a message like Good signature from lt;DEVELOPER
   NAMEgt;. If you don't, there is a problem. Try these steps again./li
-  liNow you can take the sha256sum of the Tor Browser package. On 
+  liNow you can take the sha256sum of the Tor Browser package. On
   Windows you can use the a href=http://md5deep.sourceforge.net/;
   hashdeep utility/a and run
   preC:\location\where\you\saved\hashdeep -c sha256sum lt;TOR BROWSER 
FILE NAMEgt;.exe/pre
@@ -225,17 +225,39 @@
   liOpen sha256sums.txt in a text editor./li
   liLocate the name of the Tor Browser file you downloaded./li
   liCompare the string of letters and numbers to the left of your
-  filename with the string of letters and numbers that appeared 
-  on your command line. If they match, you've successfully verified the 
-  build./li 
+  filename with the string of letters and numbers that appeared
+  on your command line. If they match, you've successfully verified the
+  build./li
 /ul
-
-pa 
href=https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-signatures;Scripts/a
 
-to a 
href=http://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x;automate/a
 
-these steps have been written, but to use them you will need to modify 
+
+pa 
href=https://github.com/isislovecruft/scripts/blob/master/verify-gitian-builder-signatures;Scripts/a
+to a 
href=http://tor.stackexchange.com/questions/648/how-to-verify-tor-browser-bundle-tbb-3-x;automate/a
+these steps have been written, but to use them you will need to modify
 them yourself with the latest Tor Browser filename./p
-
+
+hr
+
+a id=MARVerification/a
+h3a class=anchor href=#MARVerification
+Verifying MAR files we ship (advanced)/a/h3
 hr
+pStarting with Tor Browser 4.5a4 we sign our MAR files which helps
+securing our update process. The downside of this is the need for 
additional
+instructions to verify that the MAR files we ship are indeed the ones we
+produced with our Gitian setup./p
+
+pAssuming the verification happens on a Linux computer one first needs 
the
+ttmar-tools-linux*.zip/tt out of the ttgitian-builder/inputs/tt
+directory to remove the embedded signature(s). The steps to get the 
unsigned
+MAR file on a 64 bit Linux 

[tor-commits] [webwml/master] Update win32 expert bundle stable tag

2015-01-20 Thread sebastian
commit 6186ce3d83b3b8861918a091bd91f9b28efd05f0
Author: Sebastian Hahn sebast...@torproject.org
Date:   Tue Jan 20 13:24:46 2015 +0100

Update win32 expert bundle stable tag
---
 include/versions.wmi |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 24bc0be..6dcedb6 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,8 +1,8 @@
 define-tag version-stable whitespace=delete0.2.5.10/define-tag
 define-tag version-alpha whitespace=delete0.2.6.2-alpha/define-tag
 
-define-tag version-win32-stable whitespace=delete0.2.4.23/define-tag
-define-tag version-win32-alpha whitespace=delete0.2.4.23/define-tag
+define-tag version-win32-stable whitespace=delete0.2.5.10/define-tag
+define-tag version-win32-alpha whitespace=delete0.2.5.10/define-tag
 
 define-tag version-win32-bundle-stable whitespace=delete0.2.4.23/define-tag
 define-tag version-win32-bundle-alpha whitespace=delete0.2.4.23/define-tag



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Update Torbrowser changelog link

2015-01-20 Thread sebastian
commit 95f6cfec4d7fa1676a555fb79e7a8b01edbc87c8
Author: Sebastian Hahn sebast...@torproject.org
Date:   Tue Jan 20 13:28:56 2015 +0100

Update Torbrowser changelog link
---
 projects/en/torbrowser.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 4055009..3a1fc50 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -604,8 +604,8 @@
   a
   href=https://www.torproject.org/projects/torbrowser/design/;design
   document/a, the a
-  
href=https://gitweb.torproject.org/builders/tor-browser-bundle.git/blob/refs/heads/maint-3.6:/Bundle-Data/Docs/ChangeLog.txt;ChangeLog
-  for the 3.6 branch/a, and the a
+  
href=https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt?h=maint-4.0;ChangeLog
+  for the 4.0 branch/a, and the a
   
href=https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/Bundle-Data/Docs/ChangeLog.txt;ChangeLog
   for the alpha branch/a.
   /p

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Update win32 expert bundle stable tag

2015-01-20 Thread sebastian
commit 6186ce3d83b3b8861918a091bd91f9b28efd05f0
Author: Sebastian Hahn sebast...@torproject.org
Date:   Tue Jan 20 13:24:46 2015 +0100

Update win32 expert bundle stable tag
---
 include/versions.wmi |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 24bc0be..6dcedb6 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,8 +1,8 @@
 define-tag version-stable whitespace=delete0.2.5.10/define-tag
 define-tag version-alpha whitespace=delete0.2.6.2-alpha/define-tag
 
-define-tag version-win32-stable whitespace=delete0.2.4.23/define-tag
-define-tag version-win32-alpha whitespace=delete0.2.4.23/define-tag
+define-tag version-win32-stable whitespace=delete0.2.5.10/define-tag
+define-tag version-win32-alpha whitespace=delete0.2.5.10/define-tag
 
 define-tag version-win32-bundle-stable whitespace=delete0.2.4.23/define-tag
 define-tag version-win32-bundle-alpha whitespace=delete0.2.4.23/define-tag

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Provide link for TB modification documents

2015-01-20 Thread sebastian
commit c88b90f2efbde47bd49702b00e8f0de37cc4fbea
Author: Sebastian Hahn sebast...@torproject.org
Date:   Tue Jan 20 13:37:13 2015 +0100

Provide link for TB modification documents
---
 projects/en/torbrowser.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 3a1fc50..b6dd29a 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -289,7 +289,7 @@
 pSee our instructions on a href=page docs/verifying-signatureshow to 
verify package signatures/a,
   which allows you to make sure you've downloaded the file we intended
   you to get. Also, note that the Firefox ESR in our bundles is
-  modified from the a
+  a href=https://gitweb.torproject.org/tor-browser.git;modified/a 
from the a
   href=https://www.mozilla.org/en-US/firefox/organizations/;default
   Firefox ESR/a/p
 !-- alpha bundles --

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Bug 14123: Add the Tor Browser signing key

2015-01-15 Thread sebastian
commit af1c95ec9f6b2ebc3e7ba951d931a1c308e150a9
Author: Georg Koppen g...@torproject.org
Date:   Thu Jan 15 15:35:07 2015 +

Bug 14123: Add the Tor Browser signing key
---
 docs/en/signing-keys.wml |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index d114f61..b4341a5 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -23,9 +23,9 @@
 packages for RPMs, Windows, and OS X./li
 liTor Project Archive (0x886DDD89) signs the deb.torproject.org
 repositories and archives./li
-liMike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), 
-Nicolas Vigier (0xD0220E4B), and 
-Linus Nordberg (0x23291265) sign the Tor Browser releases./li
+liMike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223),
+Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265), and the
+Tor Browser Developers (0x93298290) sign the Tor Browser releases./li
 liDamian Johnson (0x9ABBEEC6) signs Arm releases./li
 liSebastian Hahn (0xC5AA446D), and David Fifield (0xC11F6276) sign 
Pluggable Transport Tor Browser Bundles. Sometimes Sebastian signs the Tor 
Browser Bundles./li
 liThe Tails team (0xBE2CD9C1) signs the Tails live system
@@ -184,6 +184,13 @@ uid  Nicolas Vigier (TBB Builds 
Signing Key) lt;boklm@torpr
  uid  Jacob Appelbaum lt;ja...@torproject.orggt;
  sub   3072R/611B45DE2517F1BA 2014-06-27 [expires: 2015-06-27]
  sub   3072R/035D7A9A67D22BC0 2014-06-27 [expires: 2015-06-27]
+
+ pub   4096R/0x4E2C6E8793298290 2014-12-15
+   Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
+ uid   Tor Browser Developers (signing key) 
lt;torbrow...@torproject.orggt;
+ sub   4096R/0x2E1AC68ED40814E0 2014-12-15
+ sub   4096R/0x7017ADCEF65C2036 2014-12-15
+ sub   4096R/0x2D000988589839A3 2014-12-15
 /pre
 
   /div

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Make the bridge user documentation usable again

2015-01-15 Thread sebastian
commit fdcf771c8ad171138a54c9dace3573788cd5970b
Author: Matthew Finkel matthew.fin...@gmail.com
Date:   Wed Jan 14 17:23:49 2015 +

Make the bridge user documentation usable again
---
 docs/en/bridges.wml |  338 ++-
 docs/en/sidenav.wmi |   18 +-
 images/tb-bridge-networksettings.png|  Bin 0 - 86129 bytes
 images/tb-bridges-custom-from-browser.png   |  Bin 0 - 107151 bytes
 images/tb-bridges-options-from-browser.png  |  Bin 0 - 66972 bytes
 images/tb-bridges-provided-from-browser.png |  Bin 0 - 84736 bytes
 images/tb-frontpage.png |  Bin 0 - 36890 bytes
 images/tb-tor-button-menu.png   |  Bin 0 - 58398 bytes
 images/tb-tor-launcher-bridges-custom.png   |  Bin 0 - 88827 bytes
 images/tb-tor-launcher-bridges-options.png  |  Bin 0 - 83439 bytes
 images/tb-tor-launcher-bridges-provided.png |  Bin 0 - 75365 bytes
 images/tb-tor-launcher-isp-interference.png |  Bin 0 - 89171 bytes
 images/tb-tor-launcher-no-proxy.png |  Bin 0 - 74714 bytes
 images/tb-tor-launcher-startup.png  |  Bin 0 - 89215 bytes
 14 files changed, 231 insertions(+), 125 deletions(-)

diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml
index 6da02cc..dd46d43 100644
--- a/docs/en/bridges.wml
+++ b/docs/en/bridges.wml
@@ -14,7 +14,7 @@
 a href=page docs/documentationDocumentation raquo; /a
 a href=page docs/bridgesBridges/a
   /div
-  div id=maincol 
+  div id=maincol
 a id=BridgeIntroduction/a
 h2a class=anchor href=#BridgeIntroductionTor: Bridges/a/h2
 hr
@@ -22,106 +22,106 @@
 p
 img width=7% height=7% style=float: left; 
src=$(IMGROOT)/icon-Obfsproxy.jpg
 bTip:/b
-Having trouble connecting to Tor even when using bridges? You will
-need to use bpluggable transports/b and bobfuscated
-bridges/b. a class=anchor href=#PluggableTransportsClick
-here for more information/a.
+Having trouble connecting to Tor? You may need to use a different 
bpluggable
+transport/b. a class=anchor href=#PluggableTransportsClick here for
+more information/a.
 /p
-
+
 p
 Bridge relays (or bridges for short) are Tor relays that aren't listed in
 the main Tor directory. Since there is no complete public list of them, 
even if
 your ISP is filtering connections to all the known Tor relays, they 
probably
 won't be able to block all the bridges. If you suspect your access to the
-Tor network is being blocked, you may want to use the bridge feature of 
Tor.
+Tor network is being blocked, you may want to use bridges.
 /p
-
+
 p
 The addition of bridges to Tor is a step forward in the blocking
 resistance race. It is perfectly possible that even if your ISP filters
 the Internet, you do not require a bridge to use Tor. So you should try
 to use Tor without bridges first, since it might work.
 /p
-
+
 p
 Note that it's also possible that Tor is non-functional for other
-reasons. The latest version of a href=page projects/torbrowserThe
-Tor Browser Bundle/a on Windows tries to give you better hints about
-why Tor is having problems connecting. You should also read a
-href=wikifaq#IinstalledTorandPolipobutitsnotworking.the
+reasons. The latest version of a href=page projects/torbrowser
+Tor Browser/a tries to give you better hints about why Tor is having
+problems connecting. You should also read a href=page 
docs/faq#DoesntWorkthe
 FAQ about problems with running Tor properly/a when you have issues.
-If you feel that the issue is clearly blocking, or you'd simply like to try
-because you're unsure or feeling adventurous, please read on. Ensure
-that you're using the a href=page download/download#Devlatest 
0.2.3.x or
-0.2.4.x bundle for your platform/a.
+If you feel that the issue is clearly related to Tor being blocked, or
+you'd simply like to try because you're unsure or feeling adventurous,
+please read on. Ensure that you're using the a href=page 
download/download#Devlatest
+Tor Browser for your platform/a.
 /p
-
+
 p
-To use a bridge, you'll need to locate one. Furthermore, you'll need to
-configure Tor with whatever bridge address you intend to use. You'll do 
this
-with Vidalia, the Tor controller.
-If your Internet connection requires the use of a proxy, you'll probably
-need to configure Vidalia to do so first. If you don't think you need
-to configure a proxy for your Internet connection, you probably don't.
-Give it a try and if you have issues, ask us for help.
+To use a bridge, you have two options. Tor Browser now provides some
+bridges by default. You can enable these easily. Unfortunately, because
+these bridges are publically distributed, it is easy for censors to block
+some of them, so some of them may not work. In this case, you'll need to
+locate different 

[tor-commits] [webwml/staging] Bug 14123: Add the Tor Browser signing key

2015-01-15 Thread sebastian
commit af1c95ec9f6b2ebc3e7ba951d931a1c308e150a9
Author: Georg Koppen g...@torproject.org
Date:   Thu Jan 15 15:35:07 2015 +

Bug 14123: Add the Tor Browser signing key
---
 docs/en/signing-keys.wml |   13 ++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index d114f61..b4341a5 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -23,9 +23,9 @@
 packages for RPMs, Windows, and OS X./li
 liTor Project Archive (0x886DDD89) signs the deb.torproject.org
 repositories and archives./li
-liMike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223), 
-Nicolas Vigier (0xD0220E4B), and 
-Linus Nordberg (0x23291265) sign the Tor Browser releases./li
+liMike Perry (0x0E3A92E4), Georg Koppen (0x4B7C3223),
+Nicolas Vigier (0xD0220E4B), Linus Nordberg (0x23291265), and the
+Tor Browser Developers (0x93298290) sign the Tor Browser releases./li
 liDamian Johnson (0x9ABBEEC6) signs Arm releases./li
 liSebastian Hahn (0xC5AA446D), and David Fifield (0xC11F6276) sign 
Pluggable Transport Tor Browser Bundles. Sometimes Sebastian signs the Tor 
Browser Bundles./li
 liThe Tails team (0xBE2CD9C1) signs the Tails live system
@@ -184,6 +184,13 @@ uid  Nicolas Vigier (TBB Builds 
Signing Key) lt;boklm@torpr
  uid  Jacob Appelbaum lt;ja...@torproject.orggt;
  sub   3072R/611B45DE2517F1BA 2014-06-27 [expires: 2015-06-27]
  sub   3072R/035D7A9A67D22BC0 2014-06-27 [expires: 2015-06-27]
+
+ pub   4096R/0x4E2C6E8793298290 2014-12-15
+   Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
+ uid   Tor Browser Developers (signing key) 
lt;torbrow...@torproject.orggt;
+ sub   4096R/0x2E1AC68ED40814E0 2014-12-15
+ sub   4096R/0x7017ADCEF65C2036 2014-12-15
+ sub   4096R/0x2D000988589839A3 2014-12-15
 /pre
 
   /div

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Bump TBB version to fix 404.

2015-01-15 Thread sebastian
commit b238c22b8f850ff9b4f619bb7db31343ea0a8bfc
Author: Mike Perry mikeperry-...@torproject.org
Date:   Tue Jan 13 21:33:20 2015 -0800

Bump TBB version to fix 404.
---
 include/versions.wmi   |   10 +-
 projects/torbrowser/RecommendedTBBVersions |4 
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 55bb32f..0075fef 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -23,10 +23,10 @@
 define-tag version-osx-ppc-stable whitespace=delete0.2.3.25/define-tag
 define-tag version-osx-ppc-alpha whitespace=delete0.2.4.17-rc/define-tag
 
-define-tag version-torbrowserbundledir whitespace=delete4.0.2/define-tag
+define-tag version-torbrowserbundledir whitespace=delete4.0.3/define-tag
 define-tag version-torbrowserbundlebetadir 
whitespace=delete4.5-alpha-2/define-tag
 
-define-tag version-torbrowserbundle whitespace=delete4.0.2/define-tag
+define-tag version-torbrowserbundle whitespace=delete4.0.3/define-tag
 define-tag version-torbrowserbundlebeta 
whitespace=delete4.5-alpha-2/define-tag
 define-tag version-torbrowser-tor whitespace=delete0.2.4.19/define-tag
 define-tag version-torbrowser-tor-components 
whitespace=deletelibevent-2.0.21-stable, zlib-1.2.8, 
openssl-1.0.1e/define-tag
@@ -37,8 +37,8 @@
 define-tag version-torbrowser-vidalia whitespace=delete0.2.21/define-tag
 define-tag version-torimbrowserbundle whitespace=delete1.3.21/define-tag
 
-define-tag version-torbrowserbundlelinux32 
whitespace=delete4.0.2/define-tag
-define-tag version-torbrowserbundlelinux64 
whitespace=delete4.0.2/define-tag
+define-tag version-torbrowserbundlelinux32 
whitespace=delete4.0.3/define-tag
+define-tag version-torbrowserbundlelinux64 
whitespace=delete4.0.3/define-tag
 define-tag version-torbrowserbundlelinux32beta 
whitespace=delete4.5-alpha-2/define-tag
 define-tag version-torbrowserbundlelinux64beta 
whitespace=delete4.5-alpha-2/define-tag
 define-tag version-gnu-torbrowser-tor whitespace=delete0.2.4.19/define-tag
@@ -47,7 +47,7 @@
 define-tag version-gnu-torbrowser-torbutton 
whitespace=delete1.5.2/define-tag
 define-tag version-gnu-torbrowser-vidalia 
whitespace=delete0.2.21/define-tag
 
-define-tag version-torbrowserbundleosx32 whitespace=delete4.0.2/define-tag
+define-tag version-torbrowserbundleosx32 whitespace=delete4.0.3/define-tag
 define-tag version-torbrowserbundleosx64 
whitespace=delete2.3.25-15/define-tag
 define-tag version-torbrowserbundleosx64beta 
whitespace=delete4.5-alpha-2/define-tag
 define-tag version-osx-torbrowser-tor whitespace=delete0.2.4.19/define-tag
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index c75968c..5839ab7 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 4.0.2-Linux,
 4.0.2-MacOS,
 4.0.2-Windows,
+4.0.3,
+4.0.3-Linux,
+4.0.3-MacOS,
+4.0.3-Windows,
 4.5-alpha-2,
 4.5-alpha-2-Linux,
 4.5-alpha-2-MacOS,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] update live mirrors

2015-01-15 Thread sebastian
://torproject.nexiom.net, , , http://torproject.nexiom.net, 
https://torproject.nexiom.net/dist, , , Wed Jan  7 18:27:42 2015
+Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, 
http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , 
http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, 
, , Thu Jan  8 02:14:18 2015
+EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, 
https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, 
, , Thu Jan  8 02:14:18 2015
+Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, 
https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, 
, , Thu Jan  8 02:14:18 2015
+Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, 
http://reichster.de/mirrors/torproject.org/, 
https://reichster.de/mirrors/torproject.org, , , 
http://reichster.de/mirrors/torproject.org/dist/, 
https://reichster.de/mirrors/torproject.org/dist/, , , Thu Jan  8 02:14:18 2015
+jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, 
http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , 
Thu Jan  8 05:01:06 2015
+tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, 
http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, 
https://tor.miglix.eu/dist/, , , Thu Jan  8 02:14:18 2015
 tor TA ninurta TOD name, TorNinurtaName, AT, Austria, AT, TRUE, TRUE, no, 
http://tor.ninurta.name/, , , , http://tor.ninurta.name/dist/, , , , Wed Oct 22 
21:02:17 2014
-fr33tux AT general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, 
TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , 
http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Wed Dec 31 
18:27:22 2014
-sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, 
FALSE, No, http://tor.iv.net.pl, https://tor.iv.net.pl, , , 
http://tor.iv.net.pl/dist/, https://tor.iv.net.pl/dist/, , , Thu Jan  1 
15:14:41 2015
-tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, 
http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, 
https://tor.static.lu/dist/, , , Wed Dec 31 18:27:22 2014
-t...@moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, 
No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , 
, http://www.moparisthebest.com/tor/dist/, 
https://www.moparisthebest.com/tor/dist/, , , Wed Dec 31 18:27:22 2014
-Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, 
http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Wed Dec 31 
18:27:22 2014
-rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, 
http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, 
https://ayo.tl/tor/dist/, , , Wed Dec 31 18:27:22 2014
-stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, 
FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , 
Wed Dec 31 18:27:22 2014
-Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, 
http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Dec 31 
18:27:22 2014
-webmaster[at]hackabit.nl, Hackabit.nl, NL, The Netherlands, Europe, TRUE, 
FALSE, No, http://hackabit.nl/tor/, https://hackabit.nl/tor/, , , 
http://hackabit.nl/tor/dist/, https://hackabit.nl/tor/dist/, , , Thu Jan  1 
15:14:41 2015
-Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, 
http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , 
Thu Jan  1 15:14:41 2015
-Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, 
http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , 
, , Wed Dec 31 18:27:22 2014
-s7r[at]sky-ip[d0t]org, sky-ip.org, NL, Netherlands, NL, TRUE, FALSE, No, 
http://beautiful-mind.sky-ip.org/, , , , 
http://beautiful-mind.sky-ip.org/dist/, , , , Wed Dec 31 18:27:22 2014
-tor#pajonzeck#de, ITsn, DE, Germany, Europe, TRUE, FALSE, No, 
http://tor.pajonzeck.de/, https://tor.pajonzeck.de/, 
rsync://tor.pajonzeck.de/tor, http://tor.pajonzeck.de/dist/, 
https://tor.pajonzeck.de/dist/, , rsync://tor.pajonzeck.de/tor/dist, 
http://zgfgvob256pffy62.onion, Wed Dec 31 18:27:22 2014
-peter AT ludikovsky DOT name, Tor Supporter, AT, Austria, Europe, TRUE, TRUE, 
No, http://tor.ludikovsky.name/, , , , http://tor.ludikovsky.name/dist, , , 
http://54lnbzjo6xlr4f4j.onion/, Wed Dec 31 18:27:22 2014
-admin AT nuclear DASH weapons DOT net, Setec Administrator, US, Texas, Austin, 
TRUE, FALSE, No, http://tor.nuclear-weapons.net, 
https://tor.nuclear-weapons.net, , , http://tor.nuclear-weapons.net/dist, , 
https://tor.nuclear-weapons.net/dist, , Wed Dec 31 18:27:22 2014
-0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, 
http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Thu 
Jan  1 16:26:00 2015
--nick at calyx dot com, The Calyx

[tor-commits] [webwml/staging] Take down the dircomm posting, per Tom's request. We have enough apps now.

2015-01-15 Thread sebastian
commit c48620b19ac8783a76bf1fb9806fe30b4ab3b9de
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Jan 14 08:48:58 2015 -0500

Take down the dircomm posting, per Tom's request. We have enough apps now.
---
 about/en/jobs-dircomms.wml |9 -
 about/en/jobs.wml  |2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/about/en/jobs-dircomms.wml b/about/en/jobs-dircomms.wml
index 991d739..a9c6c58 100644
--- a/about/en/jobs-dircomms.wml
+++ b/about/en/jobs-dircomms.wml
@@ -10,8 +10,14 @@
 a href=page about/jobsJobs/a
   /div
div id=maincol
+
+h1Note: we've received sufficient applications for this position, and are 
sorting through them and interviewing candidates. /h1
+
+!--
+
 h1Director of Communications/h1
 
+
 pThe Tor Project is seeking an accomplished Director of
 Communications who has at least 10 years of communications experience,
 ideally in an “in-house” leadership role within a complex (number and
@@ -92,8 +98,9 @@ developers, researchers, and advocates, plus many dozen 
volunteers who
 help out on a daily basis. Tor is funded in part by government
 research and development grants, and in part by individual and
 corporate donations.  /p
+--
 
-p(Posted 6 January 2015.)/p
+p(Updated 14 January 2015.)/p
 
   /div
   !-- END MAINCOL --
diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index f6a0c3a..05cdca4 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -21,7 +21,6 @@
 
 ul
 lia href=page about/jobs-projectmanagerProject Manager/a/li
-lia href=page about/jobs-dircommsDirector of Communications/a/li
 /ul
 
 pIn the past, we looked for the following people:/p
@@ -33,6 +32,7 @@
 liPluggable transport developer/li
 liLead Automation Engineer/li
 liFirefox/Thunderbird Extension Developer/li
+liDirector of Communications/li
 /ul
 
 p



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Make the bridge user documentation usable again

2015-01-15 Thread sebastian
commit fdcf771c8ad171138a54c9dace3573788cd5970b
Author: Matthew Finkel matthew.fin...@gmail.com
Date:   Wed Jan 14 17:23:49 2015 +

Make the bridge user documentation usable again
---
 docs/en/bridges.wml |  338 ++-
 docs/en/sidenav.wmi |   18 +-
 images/tb-bridge-networksettings.png|  Bin 0 - 86129 bytes
 images/tb-bridges-custom-from-browser.png   |  Bin 0 - 107151 bytes
 images/tb-bridges-options-from-browser.png  |  Bin 0 - 66972 bytes
 images/tb-bridges-provided-from-browser.png |  Bin 0 - 84736 bytes
 images/tb-frontpage.png |  Bin 0 - 36890 bytes
 images/tb-tor-button-menu.png   |  Bin 0 - 58398 bytes
 images/tb-tor-launcher-bridges-custom.png   |  Bin 0 - 88827 bytes
 images/tb-tor-launcher-bridges-options.png  |  Bin 0 - 83439 bytes
 images/tb-tor-launcher-bridges-provided.png |  Bin 0 - 75365 bytes
 images/tb-tor-launcher-isp-interference.png |  Bin 0 - 89171 bytes
 images/tb-tor-launcher-no-proxy.png |  Bin 0 - 74714 bytes
 images/tb-tor-launcher-startup.png  |  Bin 0 - 89215 bytes
 14 files changed, 231 insertions(+), 125 deletions(-)

diff --git a/docs/en/bridges.wml b/docs/en/bridges.wml
index 6da02cc..dd46d43 100644
--- a/docs/en/bridges.wml
+++ b/docs/en/bridges.wml
@@ -14,7 +14,7 @@
 a href=page docs/documentationDocumentation raquo; /a
 a href=page docs/bridgesBridges/a
   /div
-  div id=maincol 
+  div id=maincol
 a id=BridgeIntroduction/a
 h2a class=anchor href=#BridgeIntroductionTor: Bridges/a/h2
 hr
@@ -22,106 +22,106 @@
 p
 img width=7% height=7% style=float: left; 
src=$(IMGROOT)/icon-Obfsproxy.jpg
 bTip:/b
-Having trouble connecting to Tor even when using bridges? You will
-need to use bpluggable transports/b and bobfuscated
-bridges/b. a class=anchor href=#PluggableTransportsClick
-here for more information/a.
+Having trouble connecting to Tor? You may need to use a different 
bpluggable
+transport/b. a class=anchor href=#PluggableTransportsClick here for
+more information/a.
 /p
-
+
 p
 Bridge relays (or bridges for short) are Tor relays that aren't listed in
 the main Tor directory. Since there is no complete public list of them, 
even if
 your ISP is filtering connections to all the known Tor relays, they 
probably
 won't be able to block all the bridges. If you suspect your access to the
-Tor network is being blocked, you may want to use the bridge feature of 
Tor.
+Tor network is being blocked, you may want to use bridges.
 /p
-
+
 p
 The addition of bridges to Tor is a step forward in the blocking
 resistance race. It is perfectly possible that even if your ISP filters
 the Internet, you do not require a bridge to use Tor. So you should try
 to use Tor without bridges first, since it might work.
 /p
-
+
 p
 Note that it's also possible that Tor is non-functional for other
-reasons. The latest version of a href=page projects/torbrowserThe
-Tor Browser Bundle/a on Windows tries to give you better hints about
-why Tor is having problems connecting. You should also read a
-href=wikifaq#IinstalledTorandPolipobutitsnotworking.the
+reasons. The latest version of a href=page projects/torbrowser
+Tor Browser/a tries to give you better hints about why Tor is having
+problems connecting. You should also read a href=page 
docs/faq#DoesntWorkthe
 FAQ about problems with running Tor properly/a when you have issues.
-If you feel that the issue is clearly blocking, or you'd simply like to try
-because you're unsure or feeling adventurous, please read on. Ensure
-that you're using the a href=page download/download#Devlatest 
0.2.3.x or
-0.2.4.x bundle for your platform/a.
+If you feel that the issue is clearly related to Tor being blocked, or
+you'd simply like to try because you're unsure or feeling adventurous,
+please read on. Ensure that you're using the a href=page 
download/download#Devlatest
+Tor Browser for your platform/a.
 /p
-
+
 p
-To use a bridge, you'll need to locate one. Furthermore, you'll need to
-configure Tor with whatever bridge address you intend to use. You'll do 
this
-with Vidalia, the Tor controller.
-If your Internet connection requires the use of a proxy, you'll probably
-need to configure Vidalia to do so first. If you don't think you need
-to configure a proxy for your Internet connection, you probably don't.
-Give it a try and if you have issues, ask us for help.
+To use a bridge, you have two options. Tor Browser now provides some
+bridges by default. You can enable these easily. Unfortunately, because
+these bridges are publically distributed, it is easy for censors to block
+some of them, so some of them may not work. In this case, you'll need to
+locate different 

[tor-commits] [webwml/staging] youtube no longer breaks when used without flash

2015-01-15 Thread sebastian
commit cb22dc9595d7c70c60d6cddf37c8b217a631fefc
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Jan 11 20:40:18 2015 +0100

youtube no longer breaks when used without flash
---
 download/en/download-easy.wml |5 +
 download/en/download.wml  |5 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 6192162..a528e66 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -225,10 +225,7 @@ traffic/a this way, you also slow down the entire Tor 
network for everyone els
 Quicktime, and others: they can be manipulated into revealing your IP
 address.  Similarly, we do not recommend installing additional addons or
 plugins into the Tor Browser, as these may bypass Tor or otherwise harm
-your anonymity and privacy. The lack of plugins means that Youtube videos
-are blocked by default, but Youtube does provide an experimental opt-in
-feature a href=https://www.youtube.com/html5;(enable it here)/a
-that works for some videos./p
+your anonymity and privacy./p
 /li
 
 libUse HTTPS versions of websites/b
diff --git a/download/en/download.wml b/download/en/download.wml
index c1de0bc..adbecb9 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -299,10 +299,7 @@ The Tor Browser will block browser plugins such as Flash, 
RealPlayer,
 Quicktime, and others: they can be manipulated into revealing your IP address.
 Similarly, we do not recommend installing additional addons or plugins into
 the Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
-privacy. The lack of plugins means that Youtube videos are blocked by default,
-but Youtube does provide an experimental opt-in feature
-a href=https://www.youtube.com/html5;(enable it here)/a that works for 
some
-videos.
+privacy.
 
 /p
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] remove dead link in torbrowser design doc

2015-01-15 Thread sebastian
commit 7b30c8b541a2a156822e664a13023b1044d5e37c
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Jan 11 20:37:12 2015 +0100

remove dead link in torbrowser design doc
---
 projects/en/torbrowser.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 337c0e1..4055009 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -289,7 +289,7 @@
 pSee our instructions on a href=page docs/verifying-signatureshow to 
verify package signatures/a,
   which allows you to make sure you've downloaded the file we intended
   you to get. Also, note that the Firefox ESR in our bundles is
-  a 
href=https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/config/;modified/a
 from the a
+  modified from the a
   href=https://www.mozilla.org/en-US/firefox/organizations/;default
   Firefox ESR/a/p
 !-- alpha bundles --



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] remove a mirror by request

2015-01-15 Thread sebastian
commit 3a8664e29dacd5e78a0f6ed0eba839dc0d2d1d34
Author: Andrew Lewman and...@torproject.is
Date:   Wed Jan 7 23:55:18 2015 -0500

remove a mirror by request
---
 include/tor-mirrors.csv |1 -
 1 file changed, 1 deletion(-)

diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index ca7a470..b0e22e9 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -37,7 +37,6 @@ Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, 
http://tor.borgmann.tv/,
 Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, 
http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Wed 
Dec 31 18:27:22 2014
 coralcdn.org, CoralCDN, INT, International, INT, TRUE, FALSE, Yes, 
http://www.torproject.org.nyud.net/, , , , 
http://www.torproject.org.nyud.net/dist/, , , , Thu Jan  1 16:26:00 2015
 Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, 
http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Thu 
Jan  1 15:14:41 2015
- mail AT benjamin-meier DOT info, beme it, DE, Germany, DE, TRUE, FALSE, No, 
http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , 
http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, 
rsync://tor.beme-it.de/tor/dist, , Thu Jan  1 15:14:41 2015
 Tor Fan, Tor Supporter, MX, Mexico, MX, TRUE, FALSE, No, 
http://fbnaia.homelinux.net/torproject/, 
https://fbnaia.homelinux.net/torproject/, , , 
http://fbnaia.homelinux.net/torproject/dist/, 
https://fbnaia.homelinux.net/torproject/dist/, , , Wed Dec 31 18:27:22 2014
 webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, 
No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Wed 
Dec 31 18:27:22 2014
 Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, 
http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , 
, , Wed Dec 31 18:27:22 2014



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Update the sponsor list for 2014

2015-01-15 Thread sebastian
commit 684578da5e9d09f60ef87aea0f81a3190d60c6bb
Author: Andrew Lewman and...@torproject.is
Date:   Tue Jan 6 11:47:16 2015 -0500

Update the sponsor list for 2014
---
 about/en/sponsors.wml |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/about/en/sponsors.wml b/about/en/sponsors.wml
index 16da57a..576d5a2 100644
--- a/about/en/sponsors.wml
+++ b/about/en/sponsors.wml
@@ -39,6 +39,7 @@
 pWe greatly appreciate the support provided by our past sponsors
 in keeping the Tor Project progressing through our ambitious goals:/p
ul
+ lia href=https://freedom.press/;Freedom of the Press 
Foundation/a (2014)/li
  lia href=http://www.knightfoundation.org/;The Knight 
Foundation/a (2012-2013)/li
   lia href=http://www.sida.se/English/;Sida - Swedish 
International Development Cooperation Agency/a (2010-2013)/li
  liAn anonymous North American NGO (2008-2013)/li
@@ -49,7 +50,7 @@
  lia href=http://www.hrw.org/;Human Rights Watch/a (2007)/li
  lia href=http://www.torfox.org/;Torfox/a (2009)/li
   lia href=http://www.shinjiru.com/;Shinjiru Technology/a 
(2009-2011)/li
-  lia href=http://www.nationalchristian.com/;National Christian 
Foundation/a (2010-2012)/li
+  lia href=http://www.nationalchristian.com/;National Christian 
Foundation/a (2010-2012, 2014)/li
  lia href=http://www.nlnet.nl/;NLnet Foundation/a 
(2008-2009)/li
  lia href=http://www.nrl.navy.mil/;Naval Research Laboratory/a 
(2006-2010)/li
  liInternews Europe (2006-2008)/li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

2015-01-15 Thread sebastian
commit fc6478c74d0f541797c4d592c4e5095799e2ce92
Merge: 684578d a1ae777
Author: Andrew Lewman and...@torproject.is
Date:   Tue Jan 6 11:47:35 2015 -0500

Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml

 about/en/gsoc.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Updated mirror.

2015-01-15 Thread sebastian
commit 71e7d8e4d2084711c02a0ff89dc783b5b603bc1b
Author: Andrew Lewman and...@torproject.is
Date:   Tue Jan 6 09:38:49 2015 -0500

Updated mirror.
---
 include/tor-mirrors.csv |1 +
 1 file changed, 1 insertion(+)

diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index ca8ebe0..ca7a470 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -104,3 +104,4 @@ hostmas...@lucidnetworks.net, Lucid Networks, US, United 
States, US, TRUE, FALSE
 hostmas...@vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No, 
http://tor.mirror-server.de/, , , , http://tor.mirror-server.de/dist/, , , , 
Thu Jan  1 15:14:41 2015
 mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, 
http://mirror.ntzk.de/torproject.org/, https://mirror.ntzk.de/torproject.org/, 
, , http://mirror.ntzk.de/torproject.org/dist/, 
https://mirror.ntzk.de/torproject.org/dist/, , , Wed Dec 31 18:27:22 2014
 mir...@xfree.com.ar, Xfree.com.ar, AR, Argentina, South America, TRUE, FALSE, 
No, http://tor.xfree.com.ar/, , , , http://tor.xfree.com.ar/dist/, , , , Wed 
Dec 31 18:27:22 2014
+tor AT eprci NET, EPRCI, US, NH, US, TRUE, FALSE, No, http://tor.eprci.net/, 
https:/www.eprci.com/tor/, , , http://tor.eprci.net/dist/, 
https://www.eprci.com/tor/dist/, , ,
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Fixed broken link of revamp gettor for gsoc

2015-01-15 Thread sebastian
commit a1ae77725a1dc6e01b646be593ac582ba9a39dc8
Author: ileiva ile...@users.noreply.github.com
Date:   Mon Jan 5 16:55:46 2015 -0300

Fixed broken link of revamp gettor for gsoc
---
 about/en/gsoc.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/gsoc.wml b/about/en/gsoc.wml
index 3e5fdcb..2009eed 100644
--- a/about/en/gsoc.wml
+++ b/about/en/gsoc.wml
@@ -216,7 +216,7 @@
 ul
   lih4a href=https://ahmia.fi/gsoc/;Ahmia.fi - Search Engine for 
Hidden Services/a by Juha Nurmi/h4/li
   lih4a 
href=http://www.google-melange.com/gsoc/proposal/public/google/gsoc2014/amoghbl1/5629499534213120;Orbot
 amp; Orfox/a by Amogh Pradeep/h4/li
-  lih4a href=http://ileiva.github.io/gettor_proposal.html;Revamp 
GetTor/a by Israel Leiva/h4/li
+  lih4a href=http://ilv.github.io/gettor_proposal.html;Revamp 
GetTor/a by Israel Leiva/h4/li
   lih4a 
href=https://sites.google.com/site/sreenathadev/gsoc-2014-weather-rewrite;Weather
 Rewrite/a by Sreenatha Bhatlapenumarthi/h4/li
   lih4a href=http://kostas.mkj.lt/gsoc2014/gsoc2014.html;BridgeDB 
Distributor/a by Kostas Jakeliunas/h4/li
   lih4a href=http://kostas.mkj.lt/gsoc2013/gsoc2013.html;Searchable 
Tor descriptor archive/a by Kostas Jakeliunas/h4/li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Typo fix

2015-01-15 Thread sebastian
commit fa8d5238414705d4533c17cf48bc629b4ed08736
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Jan 6 22:32:24 2015 -0500

Typo fix
---
 about/en/jobs-dircomms.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/jobs-dircomms.wml b/about/en/jobs-dircomms.wml
index 379ca21..991d739 100644
--- a/about/en/jobs-dircomms.wml
+++ b/about/en/jobs-dircomms.wml
@@ -22,7 +22,7 @@ critical. The Director of Communications will work closely 
with a
 senior peer group within the organization as the communications
 partner on a variety of strategic initiatives./p
 
-h2Respnsibilities:/h2
+h2Responsibilities:/h2
 
 ul
 liWork with senior management to develop a communications strategy that will 
support Tor's organizational goals and will address Tor's diverse audiences: 
funders, hackers, human rights activists, companies, etc.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Update Ubuntu distribution codenames

2015-01-15 Thread sebastian
commit 7bcc1efd81ae53459c9736978fbcb0a8fcb201d2
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Jan 7 12:58:25 2015 +0100

Update Ubuntu distribution codenames

patch by dedal0, implements ticket #13847
---
 docs/en/debian-vidalia.wml |6 ++
 1 file changed, 6 insertions(+)

diff --git a/docs/en/debian-vidalia.wml b/docs/en/debian-vidalia.wml
index 33a6441..5662917 100644
--- a/docs/en/debian-vidalia.wml
+++ b/docs/en/debian-vidalia.wml
@@ -26,6 +26,12 @@ You'll need to set up our package repository before you can 
fetch
 Tor. First, you need to figure out the name of your distribution. Here's
 a quick mapping:
 ul
+li Ubuntu 14.10 is utopic/li
+li Ubuntu 14.04.* is trusty/li
+li Ubuntu 13.10 is saucy/li
+li Ubuntu 13.04 is raring/li
+li Ubuntu 12.04.* is precise/li
+li Ubuntu 11.10 is oneiric/li
 li Ubuntu 11.04 is natty/li
 li Ubuntu 10.10 or Trisquel 4.5 is maverick/li 
 li Ubuntu 10.04 or Trisquel 4.0 is lucid/li



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] Add the Director of Communications posting

2015-01-15 Thread sebastian
commit bc5577ed2718fc9295cc4cd17ca58d993c54bb73
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Jan 6 21:04:34 2015 -0500

Add the Director of Communications posting
---
 about/en/jobs-dircomms.wml |  108 
 about/en/jobs.wml  |1 +
 2 files changed, 109 insertions(+)

diff --git a/about/en/jobs-dircomms.wml b/about/en/jobs-dircomms.wml
new file mode 100644
index 000..379ca21
--- /dev/null
+++ b/about/en/jobs-dircomms.wml
@@ -0,0 +1,108 @@
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+
+#include head.wmi TITLE=Tor Project: Jobs (director of communications) 
CHARSET=UTF-8
+div id=content class=clearfix
+   div id=breadcrumbs
+a href=page indexHome raquo; /a
+a href=page about/overviewAbout raquo; /a
+a href=page about/jobsJobs/a
+  /div
+   div id=maincol
+h1Director of Communications/h1
+
+pThe Tor Project is seeking an accomplished Director of
+Communications who has at least 10 years of communications experience,
+ideally in an “in-house” leadership role within a complex (number and
+variety of constituents) nonprofit entity. The ability to take
+knowledge and transform it into powerful messages, and disseminate it
+to the right audiences through the best distribution channels is
+critical. The Director of Communications will work closely with a
+senior peer group within the organization as the communications
+partner on a variety of strategic initiatives./p
+
+h2Respnsibilities:/h2
+
+ul
+liWork with senior management to develop a communications strategy that will 
support Tor's organizational goals and will address Tor's diverse audiences: 
funders, hackers, human rights activists, companies, etc.
+/lili Implement and evaluate the annual communications plan across the 
network's discrete audiences in collaboration with the Tor Project team and 
constituents.
+/lili Identify challenges and emerging issues faced by the organization. 
Work with leadership team and staff to recognize communications opportunities 
and solutions, and define and execute appropriate strategies to support them.
+/lili Train staff and community members on media and coach/prep/debrief 
them for specific contacts.
+/lili Serve as communications counselor to Tor Project leadership.
+/lili Lead the generation of print and online content that engages 
audience segments and leads to
+measurable action.
+/lili Put communications vehicles in place to create momentum and 
awareness and to track
+progress toward longer term goals.
+/lili Track and measure the level of engagement within the Tor Project’s 
network over time.
+/lili Manage media contacts.
+/li/ul
+
+h2Qualifications:/h2
+
+ul
+liCommitment to Tor’s mission to be “the global resource for technology, 
advocacy, research and education in the ongoing pursuit of freedom of speech, 
privacy rights, and censorship circumvention.”
+/lili Extensive experience as a media strategist or political strategist.
+/lili Highly collaborative style; experience developing and implementing 
communications strategies.
+/lili A strong track record as an implementer who thrives on managing a 
variety of key initiatives
+concurrently.
+/lili Bachelor's degree in journalism, communications, or related field.
+/lili Minimum 10 years experience in a senior management role.
+/lili Demonstrated skill and comfort in proactively building relationships 
with top tier reporters and
+editors, and in positioning subject matter with the media to achieve 
high-impact placements.
+/lili Demonstrated experience with crisis management, including media 
crises, and driving more advantageous coverage of the organization, its 
projects, and its people.
+/lili Demonstrated ability to take initiative to work on one’s own, as 
well as in teams.
+/lili Demonstrated high-level ability to proactively pitch stories to the 
mainstream press and tech
+press. Experience placing and being part of high profile, high pressure media 
coverage.
+/lili Experience writing and placing op-eds and editorials in major 
newspapers.
+/lili Experience working with and as part of remote teams. Working with 
these teams requires
+empathy, special communications strategies and adept use of special 
technologies.
+/lili Excellent social skills and a sense of humor.
+/lili Comfortable with highly technical topics and ability to explain them 
clearly and accurately to a
+broader and non-technical audience.
+/lili Experience with collectives or other alternative organizational 
structures.
+/lili Demonstrated experience with complex and high profile social media 
engagement.
+/lili Deep understanding and ability to support organizational diversity 
and to maximize the
+strengths and advantages of this diversity.
+/lili Excellent spoken and written English; fluency in other languages 
within the Tor Project
+community is a plus.
+/lili Outstanding writer/editor.
+/lili Understanding and support for Tor’s 

[tor-commits] [webwml/staging] add two new mirrors

2015-01-15 Thread sebastian
commit 66fdc277ca999fbbfa7527f0fbdf40d7564b5fcf
Author: Andrew Lewman and...@torproject.is
Date:   Mon Jan 12 17:08:30 2015 -0500

add two new mirrors
---
 include/tor-mirrors.csv |2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index 2bc2c58..5d87dec 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -104,3 +104,5 @@ hostmas...@vieth-server.de, mirror-server.de, DE, Germany, 
DE, TRUE, TRUE, No, h
 mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, 
http://mirror.ntzk.de/torproject.org/, https://mirror.ntzk.de/torproject.org/, 
, , http://mirror.ntzk.de/torproject.org/dist/, 
https://mirror.ntzk.de/torproject.org/dist/, , , Wed Jan  7 18:27:42 2015
 mir...@xfree.com.ar, Xfree.com.ar, AR, Argentina, South America, TRUE, FALSE, 
No, http://tor.xfree.com.ar/, , , , http://tor.xfree.com.ar/dist/, , , , Thu 
Jan  8 02:14:18 2015
 tor AT eprci NET, EPRCI, US, NH, US, TRUE, FALSE, No, http://tor.eprci.net/, 
https:/www.eprci.com/tor/, , , http://tor.eprci.net/dist/, 
https://www.eprci.com/tor/dist/, , , Wed Jan  7 18:27:42 2015
+cont...@mrtino.eu, Tor Supporter, FR, France, FR, TRUE, FALSE, No, 
http://tor.mrtino.eu http://tor.mrtino.eu/dist
+t...@kura.io,KURA IO 
LIMITED,NL,Netherlands,Europe,TRUE,TRUE,TRUE,http://tor-mirror.kura.io/,https://tor-mirror.kura.io/,rsync://tor-mirror.kura.io/torproject.org,ftp://tor-mirror.kura.io,http://tor-mirror.kura.io/dist/,https://tor-mirror.kura.io/dist/,rsync://tor-mirror.kura.io/torproject.org/dist,,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] 4.0.2 is not recommended anymore

2015-01-15 Thread sebastian
commit 26eade65d132af8b75a40ff3b8ca8596345d4c48
Author: Georg Koppen g...@torproject.org
Date:   Wed Jan 14 07:18:16 2015 +

4.0.2 is not recommended anymore
---
 projects/torbrowser/RecommendedTBBVersions |4 
 1 file changed, 4 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 5839ab7..4785612 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -1,8 +1,4 @@
 [
-4.0.2,
-4.0.2-Linux,
-4.0.2-MacOS,
-4.0.2-Windows,
 4.0.3,
 4.0.3-Linux,
 4.0.3-MacOS,



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] remove dead link in torbrowser design doc

2015-01-11 Thread sebastian
commit 7b30c8b541a2a156822e664a13023b1044d5e37c
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Jan 11 20:37:12 2015 +0100

remove dead link in torbrowser design doc
---
 projects/en/torbrowser.wml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 337c0e1..4055009 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -289,7 +289,7 @@
 pSee our instructions on a href=page docs/verifying-signatureshow to 
verify package signatures/a,
   which allows you to make sure you've downloaded the file we intended
   you to get. Also, note that the Firefox ESR in our bundles is
-  a 
href=https://gitweb.torproject.org/torbrowser.git/tree/HEAD:/build-scripts/config/;modified/a
 from the a
+  modified from the a
   href=https://www.mozilla.org/en-US/firefox/organizations/;default
   Firefox ESR/a/p
 !-- alpha bundles --

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] youtube no longer breaks when used without flash

2015-01-11 Thread sebastian
commit cb22dc9595d7c70c60d6cddf37c8b217a631fefc
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Jan 11 20:40:18 2015 +0100

youtube no longer breaks when used without flash
---
 download/en/download-easy.wml |5 +
 download/en/download.wml  |5 +
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 6192162..a528e66 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -225,10 +225,7 @@ traffic/a this way, you also slow down the entire Tor 
network for everyone els
 Quicktime, and others: they can be manipulated into revealing your IP
 address.  Similarly, we do not recommend installing additional addons or
 plugins into the Tor Browser, as these may bypass Tor or otherwise harm
-your anonymity and privacy. The lack of plugins means that Youtube videos
-are blocked by default, but Youtube does provide an experimental opt-in
-feature a href=https://www.youtube.com/html5;(enable it here)/a
-that works for some videos./p
+your anonymity and privacy./p
 /li
 
 libUse HTTPS versions of websites/b
diff --git a/download/en/download.wml b/download/en/download.wml
index c1de0bc..adbecb9 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -299,10 +299,7 @@ The Tor Browser will block browser plugins such as Flash, 
RealPlayer,
 Quicktime, and others: they can be manipulated into revealing your IP address.
 Similarly, we do not recommend installing additional addons or plugins into
 the Tor Browser, as these may bypass Tor or otherwise harm your anonymity and
-privacy. The lack of plugins means that Youtube videos are blocked by default,
-but Youtube does provide an experimental opt-in feature
-a href=https://www.youtube.com/html5;(enable it here)/a that works for 
some
-videos.
+privacy.
 
 /p
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Update Ubuntu distribution codenames

2015-01-07 Thread sebastian
commit 7bcc1efd81ae53459c9736978fbcb0a8fcb201d2
Author: Sebastian Hahn sebast...@torproject.org
Date:   Wed Jan 7 12:58:25 2015 +0100

Update Ubuntu distribution codenames

patch by dedal0, implements ticket #13847
---
 docs/en/debian-vidalia.wml |6 ++
 1 file changed, 6 insertions(+)

diff --git a/docs/en/debian-vidalia.wml b/docs/en/debian-vidalia.wml
index 33a6441..5662917 100644
--- a/docs/en/debian-vidalia.wml
+++ b/docs/en/debian-vidalia.wml
@@ -26,6 +26,12 @@ You'll need to set up our package repository before you can 
fetch
 Tor. First, you need to figure out the name of your distribution. Here's
 a quick mapping:
 ul
+li Ubuntu 14.10 is utopic/li
+li Ubuntu 14.04.* is trusty/li
+li Ubuntu 13.10 is saucy/li
+li Ubuntu 13.04 is raring/li
+li Ubuntu 12.04.* is precise/li
+li Ubuntu 11.10 is oneiric/li
 li Ubuntu 11.04 is natty/li
 li Ubuntu 10.10 or Trisquel 4.5 is maverick/li 
 li Ubuntu 10.04 or Trisquel 4.0 is lucid/li

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] We have 0.2.6 packages now, yay

2015-01-04 Thread sebastian
commit 64026aaa9ef8711f86db66a4eecf2a60a186b699
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Jan 4 14:18:24 2015 +0100

We have 0.2.6 packages now, yay
---
 docs/en/debian.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/debian.wml b/docs/en/debian.wml
index d6048b2..425d7fd 100644
--- a/docs/en/debian.wml
+++ b/docs/en/debian.wml
@@ -131,7 +131,7 @@ download/download#packagediffdevelopment branch/a of 
Tor instead
 to your tt/etc/apt/sources.list/tt file:br /
 pre style=margin: 1.5em 0 1.5em 2em
 deb http://deb.torproject.org/torproject.org lt;DISTRIBUTIONgt; main
-deb http://deb.torproject.org/torproject.org 
tor-experimental-0.2.5.x-lt;DISTRIBUTIONgt; main
+deb http://deb.torproject.org/torproject.org 
tor-experimental-0.2.6.x-lt;DISTRIBUTIONgt; main
 /pre
 where you again substitute the name of your distro (lenny,
 sid, saucy, ...) in place of
@@ -169,7 +169,7 @@ deb-src http://deb.torproject.org/torproject.org 
lt;DISTRIBUTIONgt; main
 
 # For the unstable version.
 deb-src http://deb.torproject.org/torproject.org lt;DISTRIBUTIONgt; main
-deb-src http://deb.torproject.org/torproject.org 
tor-experimental-0.2.5.x-lt;DISTRIBUTIONgt; main
+deb-src http://deb.torproject.org/torproject.org 
tor-experimental-0.2.6.x-lt;DISTRIBUTIONgt; main
 /pre
 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of 
lt;DISTRIBUTIONgt;. Now refresh your sources by running (as root):
 pre style=margin: 1.5em 0 1.5em 2em

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] remove a mirror, add a new mirror

2015-01-04 Thread sebastian
commit dbfde7156e204bd5acdde0b18649c80dbd58b58a
Author: Andrew Lewman and...@torproject.is
Date:   Mon Dec 29 11:21:49 2014 -0500

remove a mirror, add a new mirror
---
 include/tor-mirrors.csv |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index 3c4d65d..d5e5c15 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -103,4 +103,5 @@ Jacob Henner, Anatomical Networks, US, United States, US, 
TRUE, TRUE, TRUE, http
 hostmas...@lucidnetworks.net, Lucid Networks, US, United States, US, TRUE, 
FALSE, No, http://tor.mirrors.lucidnetworks.net, , 
rsync://tor.mirrors.lucidnetworks.net::tor, , 
http://tor.mirrors.lucidnetworks.net/dist, , 
rsync://tor.mirrors.lucidnetworks.net::tor-dist, , Tue Dec 23 19:30:17 2014
 hostmas...@vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No, 
http://tor.mirror-server.de/, , , , http://tor.mirror-server.de/dist/, , , , 
Tue Dec 23 19:30:17 2014
 mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, 
http://mirror.ntzk.de/torproject.org/, https://mirror.ntzk.de/torproject.org/, 
, , http://mirror.ntzk.de/torproject.org/dist/, 
https://mirror.ntzk.de/torproject.org/dist/, , , Tue Dec 23 19:30:17 2014
-justaguy AT riseup DOT net, justaguy, NL, The netherlands, NL, TRUE, TRUE, No, 
http://mirrors.justaguy.pw/, https://mirrors.justaguy.pw, , , 
http://mirrors.justaguy.pw/dist/, https://mirrors.justaguy.pw/dist, , , Tue Dec 
23 19:30:17 2014
+t...@kura.io,KURA IO 
LIMITED,NL,Netherlands,Europe,TRUE,TRUE,TRUE,https://tor-mirror.kura.io/,https://tor-mirror.kura.io/,,,https://tor-mirror.kura.io/dist/,https://tor-mirror.kura.io/dist/,,,
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] update mirror status

2015-01-04 Thread sebastian
 2014
+Tor Fan, chaos darmstadt, DE, Germany, Europe, TRUE, FALSE, No, 
http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , 
http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Wed Dec 31 18:27:22 
2014
+Tor Fan, Soviet Anonymous, RU, Russia, RU, TRUE, FALSE, No, 
http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, 
ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, 
https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Wed Dec 31 18:27:22 
2014
+Tor Fan, torservers, DE, Germany, DE, TRUE, FALSE, No, 
http://www.torservers.net/mirrors/torproject.org/, 
https://www.torservers.net/mirrors/torproject.org/, , , 
http://www.torservers.net/mirrors/torproject.org/dist/, 
https://www.torservers.net/mirrors/torproject.org/dist/, , 
http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Wed Dec 31 18:27:22 2014
+Tor Fan, torland, GB, United Kingdom, GB, TRUE, FALSE, No, 
http://mirror.torland.me/torproject.org/, 
https://mirror.torland.me/torproject.org/, , , 
http://mirror.torland.me/torproject.org/dist/, 
https://mirror.torland.me/torproject.org/dist/, , , Thu Jan  1 15:14:41 2015
+Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, 
http://torproject.lightning-bolt.net/, , , , 
http://torproject.lightning-bolt.net/dist/, , , , Wed Dec 31 18:27:22 2014
+IceBear, myRL.net, IS, Iceland, IS, TRUE, FALSE, No, http://tor.myrl.net/, 
https://tor.myrl.net/, , , http://tor.myrl.net/dist/, 
https://tor.myrl.net/dist/, , , Wed Dec 31 18:27:22 2014
+kiro AT userzap DOT de, Userzap, DE, Germany, DE, TRUE, FALSE, No, 
http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , 
http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , 
Wed Dec 31 18:27:22 2014
+t...@eprci.net, EPRCI, US, United States, US, TRUE, FALSE, NO, 
http://tor.eprci.net/, https://www.eprci.com/tor/, , , 
http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Wed Dec 31 
18:27:22 2014
+t...@les.net, t...@les.net, CA, Canada, CA, TRUE, FALSE, NO, 
http://tor.les.net/, , , , http://tor.les.net/dist, , , , Wed Dec 31 18:27:22 
2014
+Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , 
http://tor.pw.is/dist/, , , , Wed Dec 31 18:27:22 2014
+t...@stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, 
http://tor.stalkr.net/, https://tor.stalkr.net/, , , 
http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Wed Dec 31 
18:27:22 2014
+doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, 
Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , 
https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, 
Wed Dec 31 18:27:22 2014
+cont...@gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, 
http://torproject.gtor.org/, https://torproject.gtor.org/, 
rsync://torproject.gtor.org/website-mirror/, , 
http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, 
rsync://torproject.gtor.org/website-mirror/dist/, , Wed Dec 31 18:27:22 2014
+SDL, SDL, US, United States, US, TRUE, TRUE, NO, http://torproject.nexiom.net, 
https://torproject.nexiom.net, , , http://torproject.nexiom.net, 
https://torproject.nexiom.net/dist, , , Wed Dec 31 18:27:22 2014
+Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, 
http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , 
http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, 
, , Wed Dec 31 18:27:22 2014
+EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, 
https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, 
, , Wed Dec 31 18:27:22 2014
+Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, 
https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, 
, , Thu Jan  1 15:14:41 2015
+Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, 
http://reichster.de/mirrors/torproject.org/, 
https://reichster.de/mirrors/torproject.org, , , 
http://reichster.de/mirrors/torproject.org/dist/, 
https://reichster.de/mirrors/torproject.org/dist/, , , Wed Dec 31 18:27:22 2014
+jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, 
http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , 
Wed Dec 31 18:27:22 2014
+tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, 
http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, 
https://tor.miglix.eu/dist/, , , Wed Dec 31 18:27:22 2014
 tor TA ninurta TOD name, TorNinurtaName, AT, Austria, AT, TRUE, TRUE, no, 
http://tor.ninurta.name/, , , , http://tor.ninurta.name/dist/, , , , Wed Oct 22 
21:02:17 2014
-fr33tux AT general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, 
TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , 
http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Tue Dec 23 
19:30:17 2014
-sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, 
FALSE

[tor-commits] [webwml/staging] update mirror status

2015-01-04 Thread sebastian
, NO, 
http://tor.les.net/, , , , http://tor.les.net/dist, , , , Tue Dec 23 19:30:17 
2014
+Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , 
http://tor.pw.is/dist/, , , , Tue Dec 23 19:30:17 2014
+t...@stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, 
http://tor.stalkr.net/, https://tor.stalkr.net/, , , 
http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Tue Dec 23 
19:30:17 2014
+doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, 
Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , 
https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, 
Tue Dec 23 19:30:17 2014
+cont...@gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, 
http://torproject.gtor.org/, https://torproject.gtor.org/, 
rsync://torproject.gtor.org/website-mirror/, , 
http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, 
rsync://torproject.gtor.org/website-mirror/dist/, , Tue Dec 23 19:30:17 2014
+SDL, SDL, US, United States, US, TRUE, TRUE, NO, http://torproject.nexiom.net, 
https://torproject.nexiom.net, , , http://torproject.nexiom.net, 
https://torproject.nexiom.net/dist, , , Tue Dec 23 19:30:17 2014
+Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, 
http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , 
http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, 
, , Tue Dec 23 19:30:17 2014
+EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, 
https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, 
, , Tue Dec 23 19:30:17 2014
+Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, 
https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, 
, , Tue Dec 23 19:30:17 2014
+Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, 
http://reichster.de/mirrors/torproject.org/, 
https://reichster.de/mirrors/torproject.org, , , 
http://reichster.de/mirrors/torproject.org/dist/, 
https://reichster.de/mirrors/torproject.org/dist/, , , Tue Dec 23 19:30:17 2014
+jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, 
http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , 
Tue Dec 23 19:30:17 2014
+tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, 
http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, 
https://tor.miglix.eu/dist/, , , Tue Dec 23 19:30:17 2014
 tor TA ninurta TOD name, TorNinurtaName, AT, Austria, AT, TRUE, TRUE, no, 
http://tor.ninurta.name/, , , , http://tor.ninurta.name/dist/, , , , Wed Oct 22 
21:02:17 2014
-fr33tux AT general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, 
TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , 
http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Wed Dec 10 
04:51:47 2014
-sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, 
FALSE, No, http://tor.iv.net.pl, https://tor.iv.net.pl, , , 
http://tor.iv.net.pl/dist/, https://tor.iv.net.pl/dist/, , , Tue Dec  9 
18:03:30 2014
-tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, 
http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, 
https://tor.static.lu/dist/, , , Tue Dec  9 18:03:30 2014
-t...@moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, 
No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , 
, http://www.moparisthebest.com/tor/dist/, 
https://www.moparisthebest.com/tor/dist/, , , Wed Dec 10 06:15:09 2014
-Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, 
http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Wed Dec 10 
04:51:47 2014
-rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, 
http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, 
https://ayo.tl/tor/dist/, , , Tue Dec  9 15:14:20 2014
-stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, 
FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , 
Wed Dec 10 04:51:47 2014
-Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, 
http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Dec 10 
04:51:47 2014
-webmaster[at]hackabit.nl, Hackabit.nl, NL, The Netherlands, Europe, TRUE, 
FALSE, No, http://hackabit.nl/tor/, https://hackabit.nl/tor/, , , 
http://hackabit.nl/tor/dist/, https://hackabit.nl/tor/dist/, , , Wed Dec 10 
03:55:27 2014
-Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, 
http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , 
Wed Dec 10 04:51:47 2014
-Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, 
http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , 
, , Wed Dec 10 04:51:47 2014
-s7r[at]sky-ip[d0t]org, sky-ip.org, NL, Netherlands, NL, TRUE, FALSE, No, 
http

[tor-commits] [webwml/staging] Suggest ORPort auto with obfsproxy bridges

2015-01-04 Thread sebastian
commit 7c8736a77a2c33a860d2bf3b4017741ddae400d0
Author: Nick Mathewson ni...@torproject.org
Date:   Tue Dec 23 13:27:09 2014 -0500

Suggest ORPort auto with obfsproxy bridges

Closes ticket 13996
---
 projects/en/obfsproxy-debian-instructions.wml |2 +-
 projects/en/obfsproxy-instructions.wml|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/en/obfsproxy-debian-instructions.wml 
b/projects/en/obfsproxy-debian-instructions.wml
index 82aeae6..4911bc5 100644
--- a/projects/en/obfsproxy-debian-instructions.wml
+++ b/projects/en/obfsproxy-debian-instructions.wml
@@ -65,7 +65,7 @@
 
 pre style=margin: 1.5em 0 1.5em 2em
 SocksPort 0
-ORPort 443 # or some other port if you already run a webserver/skype
+ORPort auto
 BridgeRelay 1
 Exitpolicy reject *:*
 
diff --git a/projects/en/obfsproxy-instructions.wml 
b/projects/en/obfsproxy-instructions.wml
index 46caabc..4df5fee 100644
--- a/projects/en/obfsproxy-instructions.wml
+++ b/projects/en/obfsproxy-instructions.wml
@@ -84,7 +84,7 @@
 
   p
 ttSocksPort 0/ttbr
-ttORPort 443 # or some other port if you already run a 
webserver/skype/ttbr
+ttORPort auto/ttbr
 ttBridgeRelay 1/ttbr
 ttExitpolicy reject *:*/ttbrbr
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] 0.2.6.2-alpha is out.

2015-01-04 Thread sebastian
commit 8494ef101b3719b5ff523a3a9af255806425ebda
Author: Nick Mathewson ni...@torproject.org
Date:   Wed Dec 31 13:16:41 2014 -0500

0.2.6.2-alpha is out.
---
 Makefile |2 +-
 include/versions.wmi |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 872c384..d8dda85 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.2.5.10
-export DEVTAG=tor-0.2.6.1-alpha
+export DEVTAG=tor-0.2.6.2-alpha
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index 48bc738..55bb32f 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 define-tag version-stable whitespace=delete0.2.5.10/define-tag
-define-tag version-alpha whitespace=delete0.2.6.1-alpha/define-tag
+define-tag version-alpha whitespace=delete0.2.6.2-alpha/define-tag
 
 define-tag version-win32-stable whitespace=delete0.2.4.23/define-tag
 define-tag version-win32-alpha whitespace=delete0.2.4.23/define-tag



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] update justaguy's mirror

2015-01-04 Thread sebastian
commit c7d965d299abc89ab794fd2a52491499dc1258a0
Author: Andrew Lewman and...@torproject.is
Date:   Wed Dec 24 10:22:22 2014 -0500

update justaguy's mirror
---
 include/tor-mirrors.csv |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index 7e72fcf..1c392ed 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -99,8 +99,8 @@ James Murphy, intfxdx.com, US, United States, US, TRUE, TRUE, 
No, http://108.248
 Sam Whited 4096R/54083AE104EA7AD3 s...@samwhited.com, SamWhited.com, US, GA, 
United States, TRUE, TRUE, FALSE, http://mirrors.samwhited.net/tor, 
https://mirrors.samwhited.net/tor, rsync://mirrors.samwhited.net/tor, , 
http://mirrors.samwhited.net/tor/dist, https://mirrors.samwhited.net/tor/dist, 
rsync://mirrors.samwhited.net/tor-dist, , Wed Dec 10 04:51:47 2014
 rohit008 AT e DOT ntu DOT edu DOT sg, NTUOSS, SG, Singapore, Asia, TRUE, 
FALSE, No, http://torproject.ntuoss.com/, , , , 
http://torproject.ntuoss.com/dist/, , , , Wed Dec  3 15:15:20 2014
 jvictors at jessevictors dot com, Department of CS at USU, US, United States, 
North America, TRUE, FALSE, No, 
http://tor-relay.cs.usu.edu/mirrors/torproject.org/, 
https://www.jessevictors.com/secureMirrors/torproject.org/, , , 
http://tor-relay.cs.usu.edu/mirrors/torproject.org/dist/, 
https://www.jessevictors.com/secureMirrors/torproject.org/dist/, , , Tue Dec  9 
18:03:30 2014
-justaguy AT riseup DOT net, justaguy, UK, United KIngdom, UK, TRUE, TRUE, No, 
http://mirrors.justaguy.pw/, , , , http://mirrors.justaguy.pw/dist/, , , , Wed 
Dec 10 04:51:47 2014
 Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, 
http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Dec 10 
04:51:47 2014
 hostmas...@lucidnetworks.net, Lucid Networks, US, United States, US, TRUE, 
FALSE, No, http://tor.mirrors.lucidnetworks.net, , 
rsync://tor.mirrors.lucidnetworks.net::tor, , 
http://tor.mirrors.lucidnetworks.net/dist, , 
rsync://tor.mirrors.lucidnetworks.net::tor-dist, , Tue Dec  9 18:03:30 2014
 hostmas...@vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No, 
http://tor.mirror-server.de/, , , , http://tor.mirror-server.de/dist/, , , , 
Wed Dec 10 04:51:47 2014
 mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, 
http://mirror.ntzk.de/torproject.org/, https://mirror.ntzk.de/torproject.org/, 
, , http://mirror.ntzk.de/torproject.org/dist/, 
https://mirror.ntzk.de/torproject.org/dist/, , , Wed Dec 10 04:51:47 2014
+justaguy AT riseup DOT net, justaguy, NL, The netherlands, NL, TRUE, TRUE, No, 
http://mirrors.justaguy.pw/, https://mirrors.justaguy.pw, , , 
http://mirrors.justaguy.pw/dist/, https://mirrors.justaguy.pw/dist,,,
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/staging] update mirrors

2015-01-04 Thread sebastian
commit de7351e9ad8c3d4643f113a713ae86b2b2fe91dc
Author: Andrew Lewman and...@torproject.is
Date:   Thu Jan 1 11:20:15 2015 -0500

update mirrors
---
 include/tor-mirrors.csv |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index d5e5c15..04cf79f 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -103,5 +103,4 @@ Jacob Henner, Anatomical Networks, US, United States, US, 
TRUE, TRUE, TRUE, http
 hostmas...@lucidnetworks.net, Lucid Networks, US, United States, US, TRUE, 
FALSE, No, http://tor.mirrors.lucidnetworks.net, , 
rsync://tor.mirrors.lucidnetworks.net::tor, , 
http://tor.mirrors.lucidnetworks.net/dist, , 
rsync://tor.mirrors.lucidnetworks.net::tor-dist, , Tue Dec 23 19:30:17 2014
 hostmas...@vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No, 
http://tor.mirror-server.de/, , , , http://tor.mirror-server.de/dist/, , , , 
Tue Dec 23 19:30:17 2014
 mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, 
http://mirror.ntzk.de/torproject.org/, https://mirror.ntzk.de/torproject.org/, 
, , http://mirror.ntzk.de/torproject.org/dist/, 
https://mirror.ntzk.de/torproject.org/dist/, , , Tue Dec 23 19:30:17 2014
-t...@kura.io,KURA IO 
LIMITED,NL,Netherlands,Europe,TRUE,TRUE,TRUE,https://tor-mirror.kura.io/,https://tor-mirror.kura.io/,,,https://tor-mirror.kura.io/dist/,https://tor-mirror.kura.io/dist/,,,
-
+mir...@xfree.com.ar, Xfree.com.ar, AR, Argentina, South America, TRUE, FALSE, 
No, http://tor.xfree.com.ar/, , , , http://tor.xfree.com.ar/dist/, , , 
,t...@kura.io,KURA IO 
LIMITED,NL,Netherlands,Europe,TRUE,TRUE,TRUE,http://tor-mirror.kura.io/,https://tor-mirror.kura.io/,rsync://tor-mirror.kura.io/torproject.org,ftp://tor-mirror.kura.io,http://tor-mirror.kura.io/dist/,https://tor-mirror.kura.io/dist/,rsync://tor-mirror.kura.io/torproject.org/dist,,
\ No newline at end of file



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] We have 0.2.6 packages now, yay

2015-01-04 Thread sebastian
commit 64026aaa9ef8711f86db66a4eecf2a60a186b699
Author: Sebastian Hahn sebast...@torproject.org
Date:   Sun Jan 4 14:18:24 2015 +0100

We have 0.2.6 packages now, yay
---
 docs/en/debian.wml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/debian.wml b/docs/en/debian.wml
index d6048b2..425d7fd 100644
--- a/docs/en/debian.wml
+++ b/docs/en/debian.wml
@@ -131,7 +131,7 @@ download/download#packagediffdevelopment branch/a of 
Tor instead
 to your tt/etc/apt/sources.list/tt file:br /
 pre style=margin: 1.5em 0 1.5em 2em
 deb http://deb.torproject.org/torproject.org lt;DISTRIBUTIONgt; main
-deb http://deb.torproject.org/torproject.org 
tor-experimental-0.2.5.x-lt;DISTRIBUTIONgt; main
+deb http://deb.torproject.org/torproject.org 
tor-experimental-0.2.6.x-lt;DISTRIBUTIONgt; main
 /pre
 where you again substitute the name of your distro (lenny,
 sid, saucy, ...) in place of
@@ -169,7 +169,7 @@ deb-src http://deb.torproject.org/torproject.org 
lt;DISTRIBUTIONgt; main
 
 # For the unstable version.
 deb-src http://deb.torproject.org/torproject.org lt;DISTRIBUTIONgt; main
-deb-src http://deb.torproject.org/torproject.org 
tor-experimental-0.2.5.x-lt;DISTRIBUTIONgt; main
+deb-src http://deb.torproject.org/torproject.org 
tor-experimental-0.2.6.x-lt;DISTRIBUTIONgt; main
 /pre
 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of 
lt;DISTRIBUTIONgt;. Now refresh your sources by running (as root):
 pre style=margin: 1.5em 0 1.5em 2em

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


<    4   5   6   7   8   9   10   11   12   13   >