[tor-commits] [webwml/staging] weasel says specifying x-hkp:// or hkp:// is not needed

[sebastian]

commit b06002fa59ad97a56fdd69976c2821d192ada7d9
Author: Roger Dingledine 
Date:   Thu Aug 4 16:55:10 2016 -0400

weasel says specifying x-hkp:// or hkp:// is not needed

also apparently x-hkp:// doesn't work on some clients
---
 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 45ffb28..6d96984 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -69,7 +69,7 @@
 something like this: C:\Program Files\Gnu\GnuPg\gpg.exe.
 The Tor Browser team signs the Tor Browsers. Import its key
 (0x4E2C6E8793298290) by starting cmd.exe and typing:
-"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver 
x-hkp://pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290
+"C:\Program Files\Gnu\GnuPg\gpg.exe" --keyserver 
pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290
 After importing the key, you can verify that the fingerprint
 is correct:
 "C:\Program Files\Gnu\GnuPg\gpg.exe" --fingerprint 
0x4E2C6E8793298290
@@ -118,7 +118,7 @@
 key (0x4E2C6E8793298290) by starting the terminal (under "Applications"
 in Mac OS X) and typing:
 
-gpg --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 
0x4E2C6E8793298290
+gpg --keyserver pool.sks-keyservers.net --recv-keys 
0x4E2C6E8793298290
 
 After importing the key, you can verify that the fingerprint
 is correct:



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

[tor-commits] [webwml/staging] Update board page with new board

[sebastian]

commit 014f513547af396941ba043ca51b718995707b16
Author: Sebastian Hahn 
Date:   Fri Jul 22 13:06:57 2016 +0200

Update board page with new board
---
 about/en/board.wml | 126 ++---
 1 file changed, 71 insertions(+), 55 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 426d0ff..0f8537a 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -14,88 +14,104 @@
 
   
 
-  Caspar Bowden
-  Director
+  Matth Blaze
+  Board Chair
   
-  Caspar was an advocate for Tor in Europe and a specialist in
-  data protection policy, EU and US surveillance law, PET
-  research, identity management, and information ethics and
-  philosophy. He was formerly the chief privacy advisor at
-  Microsoft. He believed that people in every country deserved
-  the right to privacy irrespective of national borders. He
-  predicted US mass surveillance programs such as PRISM and was
-  vindicated after the Snowden revelations. We miss him deeply.
+Matt is a professor in the computer and information science
+department at the University of Pennsylvania, where he directs the
+Distributed Systems Laboratory. He has been doing research on
+surveillance technology for over 20 years, as well as cryptography,
+secure systems, and public policy.
   
 
 
-  Nick Mathewson
-  Vice-President and Director
+  Linus Nordberg
+  Director
   
-Nick is one of the original developers of Tor.  He's the
-Chief Architect of The Tor Project, Inc.
+Linus is a longtime internet and privacy activist who has been
+involved with Tor since 2009. Linus is a software developer who
+specializes in network security and operating internet services.
+Since his start at Tor he's developed code, run services, and
+advocated for the Tor Project. He's one of the founders of the
+Swedish digital rights organization DFRI (Digitala Fri- och
+Rättigheter) and through that involved in the European umbrella
+public policy organization EDRi (European Digital Rights).
   
 
   
   
 
-  Roger Dingledine
-  President and Director
+  Cindy Cohn
+  Board Treasurer
   
-Original developer of Tor along with Nick Mathewson and Paul
-Syverson. Leading researcher in the anonymous communications
-field.  Frequent speaker at conferences to advocate Tor and
-explain what Tor is and can do. Helps coordinate academic
-researchers.
+Cindy is the Executive Director of the Electronic Frontier
+Foundation (EFF). From 2000 to 2015 she served as EFF’s Legal
+Director as well as its General Counsel.  Cindy first became
+involved with EFF in 1993, when EFF asked her to serve as the
+outside lead attorney in Bernstein v. Dept. of Justice, the
+successful First Amendment challenge to the U.S. export
+restrictions on cryptography. Ms.  Cohn works to ensure that people
+around the world have the right to access information and
+communicate privately and anonymously, including mounting lawsuits
+against NSA spying, providing legal counsel to computer programmers
+building and developing privacy and anonymity tools, and helping to
+develop the Necessary and Proportionate Principles applying
+international human rights standards to digital communications
+surveillance.
   
 
 
-  Julius Mittenzwei
+  Megan Price
   Director
   
-Germany-based lawyer and Internet activist.
+Megan is Executive Director of the Human Rights Data Analysis
+Group, where she designs strategies and methods for statistical
+analysis of human rights data for projects in places like
+Guatemala, Colombia, and Syria. She is lead statistician on a
+project in Guatemala in which she analyzes documents from the
+National Police Archive. She is lead statistician and author on
+three reports on documented deaths in Syria, commissioned by the
+officer of the United Nations High Commissioner of Human Rights.
+Megan is on the Technical Advisory Board for the Office of the
+Prosecutor at the International Criminal Court, a Research Fellow
+at the Carnegie Mellon University Center for Human Rights Science,
+and Human Rights Editor for the Statistical Journal of the
+International 

[tor-commits] [webwml/staging] Remove redundant sentence

[sebastian]

commit c4cd913c38b541935c2254ed09e85181eeb1c3b9
Author: Sebastian Hahn 
Date:   Fri Jul 15 13:32:05 2016 +0200

Remove redundant sentence
---
 docs/en/pluggable-transports.wml | 4 
 1 file changed, 4 deletions(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 5e15422..d729353 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -204,10 +204,6 @@
 
 
 
- Also see the unofficial pluggable transports https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports";>wiki
-page for more pluggable transport information.
-
 Our goal is to have a wide variety of Pluggable Transport designs. You 
can check out a https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/list";>full
 list of Pluggables Transports here.
 
 Many are at the research phase now, so it's a perfect time to play with 
them or suggest new designs. Please let us know if you find or start other 
projects that could be useful for making Tor's traffic flows more DPI-resistant!



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

[tor-commits] [webwml/staging] more link fixing

[sebastian]

commit c21cddf4bc79fe33d9be80d1df97d3643606488a
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:45:02 2016 +0200

more link fixing
---
 docs/en/faq.wml  | 10 +-
 docs/en/tor-doc-relay.wml|  3 ++-
 en/index.wml |  2 +-
 getinvolved/en/volunteer.wml | 11 ---
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index f98bc11..c238ca6 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -1482,14 +1482,6 @@ 
href="http://www.crowdstrike.com/community-tools/index.html#tool-79";>proposed
 Exitpolicy reject *:*
 BridgeRelay 1  # only add this line if you want to be a bridge
 
-
-If you've installed Obfsproxy,
-you'll need to add one more line:
-
-
-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
-
 
 
 
@@ -2581,7 +2573,7 @@ short)
 
 Several countries, including China and Iran, have found ways to
 detect and block connections to Tor bridges.
-Obfsproxy bridges address
+Obfsproxy bridges address
 this by adding another layer of obfuscation.
 
 
diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml
index c932c33..7f897d3 100644
--- a/docs/en/tor-doc-relay.wml
+++ b/docs/en/tor-doc-relay.wml
@@ -55,9 +55,10 @@
 ContactInfo human@...
 
 
+# TODO: Update link to PT setup docs
 If you want to be a bridge, read about the BridgeRelay and
 ServerTransportPlugin values on
+href="">on
 this page.
 
 Tor will use all your bandwidth if you don't set limits for it. Some
diff --git a/en/index.wml b/en/index.wml
index fededd4..836d3b0 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -118,7 +118,7 @@
 -->
   
 
-
 Pluggable 
Transports
 Pluggable transports help you circumvent censorship.
diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 8d9335d..20f7190 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -518,17 +518,6 @@ meetings around the world.
 TorBirdy is Torbutton for Thunderbird and related Mozilla mail clients.
 
 
-
-Obfsproxy (https://gitweb.torproject.org/pluggable-transports/obfsproxy.git";>code,
-https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Obfuscation%2FObfsproxy&order=priority";>bug
-tracker)
-
-
-A proxy that shapes Tor traffic, making it harder for censors to detect and
-block Tor. This has both a C and python implementation.
-
-
 
 https://crypto.stanford.edu/flashproxy/";>Flash Proxy (https://gitweb.torproject.org/flashproxy.git";>code, https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Remove 'Exitmap Improvements' project idea

[sebastian]

commit 5051d73aa38db7ec22b7dbf73a854094d0d30788
Author: Damian Johnson 
Date:   Tue Aug 30 10:13:26 2016 -0700

Remove 'Exitmap Improvements' project idea

Removing as requested by Philipp.
---
 getinvolved/en/volunteer.wml | 40 
 1 file changed, 40 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 3e12459..8f785db 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -680,11 +680,6 @@ meetings around the world.
 Onions research paper.
 
 
-
-Project Ideas:
-Exitmap Improvements
-
-
 
 DocTor (https://gitweb.torproject.org/doctor.git";>code, 
 
 
-
-
-Exitmap Improvements
-
-Language: Python
-
-Likely Mentors: Philipp (phw)
-
-
-The Tor Project makes use of the Python tool https://gitweb.torproject.org/user/phw/exitmap.git/";>Exitmap to
-systematically scan for malicious and misbehaving exit relays.  Once such a
-relay is found, it is assigned the BadExit flag which prevents clients from
-selecting the relay as last hop in their circuit.
-
-
-
-Exitmap supports scanning modules which implement a specific scan over
-exit relays.  Examples are the DNS module which checks for DNS poisoning
-or the patching check module which looks out for tampered file
-downloads.
-
-
-
-This project is meant to extend exitmap in several ways.  First, it
-should be made fully autonomous.  That means that exitmap should be able
-to run in the background, periodically fetch new relay descriptors, and
-have a smart algorithm which keeps scanning all exit relays
-periodically.  Second, exitmap should be able to emulate some user
-interaction and dynamically "explore" the web in order to detect
-tampering.  Third, unit tests should be added for existing and new code
-in order to make the code base more robust.
-
-
-
 
 
 Expand Nyx



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

[tor-commits] [webwml/staging] zooko.com is broken, link to https://en.wikipedia.org/wiki/Zooko%27s_triangle instead

[sebastian]

commit 59126df8bc335a265e70a7e2d3cf0a94dfb2fc16
Author: Peter Palfrader 
Date:   Sun Jul 31 11:53:52 2016 +0200

zooko.com is broken, link to 
https://en.wikipedia.org/wiki/Zooko%27s_triangle instead
---
 docs/en/hidden-services.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/hidden-services.wml b/docs/en/hidden-services.wml
index 1b4125b..bf9ae60 100644
--- a/docs/en/hidden-services.wml
+++ b/docs/en/hidden-services.wml
@@ -56,7 +56,7 @@
 service name, it serves an important goal: Everyone – including
 the introduction points, the distributed hash table directory, and of 
course the
 clients – can verify that they are talking to the right hidden
-service. See also http://zooko.com/distnames.html";>Zooko's
+service. See also https://en.wikipedia.org/wiki/Zooko%27s_triangle";>Zooko's
 conjecture that out of Decentralized, Secure, and Human-Meaningful,
 you can achieve at most two. Perhaps one day somebody will implement a http://www.skyhunter.com/marcs/petnames/IntroPetNames.html";>Petname



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

[tor-commits] [webwml/staging] Some tweaks to pt page

[sebastian]

commit e11c4d8a1b59ac4f6b9e1e24f72a86bb3e061a1c
Author: Sebastian Hahn 
Date:   Fri Jul 15 13:31:43 2016 +0200

Some tweaks to pt page
---
 docs/en/pluggable-transports.wml | 72 +++-
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 44e4736..5e15422 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -11,28 +11,42 @@
   
   
 Tor: Pluggable Transports
-
+
 
-
-Sometimes the Tor network is censored, and you can't connect it.
-
+
+Sometimes the Tor network is censored, and you can't connect to
+it.
+
 
-
-An increasing number of censoring countries are using Deep Packet 
Inspection (DPI) to classify Internet traffic flows by protocol. While Tor uses 
bridge relays to get around a censor that 
blocks by IP address, the censor can use DPI to recognize and filter Tor 
traffic flows even when they connect to unexpected IP addresses.
+
+
+An increasing number of censoring countries are using Deep Packet
+Inspection (DPI) to classify Internet traffic flows by protocol.
+While Tor uses bridge relays to
+get around a censor that blocks by IP address, the censor can use
+DPI to recognize and filter Tor traffic flows even when they connect
+to unexpected IP addresses.
 
 
 Pluggable Transports help you bypass censorship against Tor.
-
+
 
-
-Pluggable Transports (PT) transform the Tor traffic flow between the 
client and the bridge. This way, censors who monitor traffic between the client 
and the bridge will see innocent-looking transformed traffic instead of the 
actual Tor traffic. External programs can talk to Tor clients and Tor bridges 
using the https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable 
transport API, to make it easier to build interoperable programs.
+
+
+Pluggable Transports (PT) transform the Tor traffic flow between the client
+and the bridge. This way, censors who monitor traffic between the client
+and the bridge will see innocent-looking transformed traffic instead of the
+actual Tor traffic.
+External programs can talk to Tor clients and Tor bridges using the https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable
+transport API, to make it easier to build interoperable programs.
 
 
 
-Here you will learn:
-
+Learn more:
+
 
-
+
 
 How to use a Pluggable Transport
 How to become a PT bridge operator
@@ -44,7 +58,7 @@
 How to use PTs to bypass censorship
 If connections to the Tor network are being blocked by your ISP or 
country, follow these instructions:
 
-
+
  
 
 
@@ -58,27 +72,39 @@
 
 
 
-Anyone can set up a PT bridge server and help provide bandwidth to 
users who needs it. Once you set up a transport type, your bridge will 
automatically advertise support for the transport in its descriptor.
+
+Anyone can set up a PT bridge server and help provide bandwidth to users
+who needs it. Once you set up a transport type, your bridge will
+automatically advertise support for the transport in its descriptor.
+
 
-obfs4 is currently the most effective transport to 
bypass censorship. We are asking voluntters to run bridges for it.
-To learn how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
+
+obfs4 is currently the most effective transport to bypass
+censorship. We are asking voluntters to run bridges for it. To learn
+how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
+wiki page.
 
 
-https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#BecomeaPTbridgeoperator";>Go
 to our wiki to learn how to set up other types of PTs.
+
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#BecomeaPTbridgeoperator";>Go
+to our wiki to learn how to set up other types of PTs.
+
 
 
 
 Become a PT developer:
 
- The links below are the main documentation that will help guide 
through what you should consider while designing your PT:
+ The links below are the main documentation for PT developers
 
 
 https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/GuidelinesForDeployingPTs";>Guidelines
 for deploying Pluggable Transports on Tor Browser
-https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>PT technical 
spec​
+https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>PT technical 
spec
 https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/P

[tor-commits] [webwml/staging] Add new Tor Browser versions: 6.5a2, 6.5a2-hardened

[sebastian]

commit 8e9c2c5a0dee4451f5e53d008808a91b1f9b893f
Author: Nicolas Vigier 
Date:   Wed Aug 3 13:43:04 2016 +0200

Add new Tor Browser versions: 6.5a2, 6.5a2-hardened
---
 include/versions.wmi   | 18 +-
 projects/torbrowser/RecommendedTBBVersions |  8 +++-
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 72a621f..90b937c 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -5,28 +5,28 @@
 
 maint-6.0
 6.0.3
-6.5a1
+6.5a2
 
 6.0.3
 2016-08-02
-6.5a1
-2016-06-07
+6.5a2
+2016-08-03
 
 6.0.3
 2016-08-02
 6.0.3
 2016-08-02
-6.5a1
-2016-06-07
-6.5a1
-2016-06-07
+6.5a2
+2016-08-03
+6.5a2
+2016-08-03
 
 6.0.3
 2016-08-02
 6.0.3
 2016-08-02
-6.5a1
-2016-06-07
+6.5a2
+2016-08-03
 
 ../dist/torbrowser//tor-win32-.zip
 
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 23381ec..2f40529 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -16,5 +16,11 @@
 "6.5a1-MacOS",
 "6.5a1-Windows",
 "6.5a1-hardened",
-"6.5a1-hardened-Linux"
+"6.5a1-hardened-Linux",
+"6.5a2",
+"6.5a2-Linux",
+"6.5a2-MacOS",
+"6.5a2-Windows",
+"6.5a2-hardened",
+"6.5a2-hardened-Linux"
 ]



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

[tor-commits] [webwml/staging] Update Tor Browser ChangeLog branch

[sebastian]

commit 738535f7cae0d9a75bc81fb3c4f815bd8aaac0cf
Author: Nicolas Vigier 
Date:   Tue Aug 2 20:32:34 2016 +0200

Update Tor Browser ChangeLog branch
---
 include/versions.wmi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 6c5b8f8..6e534b5 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -3,7 +3,7 @@
 
 0.2.7.6
 
-maint-5.5
+maint-6.0
 6.0.3
 6.5a1
 



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

[tor-commits] [webwml/staging] Once more there is a dev version of tor. This time it is 0.2.9.1-alpha

[sebastian]

commit 4b3fd88956930c7e72c276ea113948b26acc840d
Author: Nick Mathewson 
Date:   Mon Aug 8 17:53:15 2016 -0400

Once more there is a dev version of tor. This time it is 0.2.9.1-alpha
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 4a870ed..5a2b240 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.2.8.6
-#export DEVTAG=tor-0.2.8.5-rc
+export DEVTAG=tor-0.2.9.1-alpha
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index 90b937c..10339a0 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.2.8.6
-
+0.2.9.1-alpha
 
 0.2.7.6
 



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

[tor-commits] [webwml/staging] Merge pull request #1 from isabelabagueros/description

[sebastian]

commit 8f2b64ac18da6e6ff27a5f7e3e2490f66ee5d247
Merge: c4cd913 870750e
Author: isabelabagueros 
Date:   Sat Jul 16 17:42:22 2016 -0700

Merge pull request #1 from isabelabagueros/description

adding gettor info on meta description for folks who can't open our site

 include/head.wmi | 1 +
 1 file changed, 1 insertion(+)



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

[tor-commits] [webwml/staging] Deprecate old Tor Browser versions

[sebastian]

commit 923e0efd12cd064238a0a505b90b1bbfe13b996b
Author: Nicolas Vigier 
Date:   Thu Aug 4 21:00:52 2016 +0200

Deprecate old Tor Browser versions
---
 projects/torbrowser/RecommendedTBBVersions | 14 --
 1 file changed, 14 deletions(-)

diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 2f40529..7f3b902 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -1,22 +1,8 @@
 [
-"6.0.1",
-"6.0.1-Linux",
-"6.0.1-MacOS",
-"6.0.1-Windows",
-"6.0.2",
-"6.0.2-Linux",
-"6.0.2-MacOS",
-"6.0.2-Windows",
 "6.0.3",
 "6.0.3-Linux",
 "6.0.3-MacOS",
 "6.0.3-Windows",
-"6.5a1",
-"6.5a1-Linux",
-"6.5a1-MacOS",
-"6.5a1-Windows",
-"6.5a1-hardened",
-"6.5a1-hardened-Linux",
 "6.5a2",
 "6.5a2-Linux",
 "6.5a2-MacOS",



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

[tor-commits] [webwml/staging] adding gettor info on meta description for folks who can't open our website

[sebastian]

commit 870750e14de3155782c8e9a19ab2563d072c008d
Author: toya 
Date:   Sat Jul 16 17:42:33 2016 -0700

adding gettor info on meta description for folks who can't open our website
---
 include/head.wmi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/head.wmi b/include/head.wmi
index f354839..15eee5b 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -14,6 +14,7 @@



+   

https://www.torproject.org/images/tor-logo.jpg";>
 



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

[tor-commits] [webwml/staging] changed for an easier phrase

[sebastian]

commit 3900758dfe25b5d56afa517d3cd631f3058beb03
Author: toya 
Date:   Sat Jul 16 18:00:24 2016 -0700

changed for an easier phrase
---
 include/head.wmi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/head.wmi b/include/head.wmi
index 15eee5b..99cea11 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -14,7 +14,7 @@



-   
+   

https://www.torproject.org/images/tor-logo.jpg";>
 



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

[tor-commits] [webwml/staging] updated pt page organizing content according to audience

[sebastian]

commit 41612b5f7d12a764c8f4673e682ed9d2e0b7377f
Author: toya 
Date:   Thu Jul 14 22:17:09 2016 -0700

updated pt page organizing content according to audience
---
 docs/en/pluggable-transports.wml | 235 ---
 1 file changed, 122 insertions(+), 113 deletions(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 3cd7033..44e4736 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -10,85 +10,123 @@
 Pluggable Transports
   
   
-Tor: Pluggable Transports
+Tor: Pluggable Transports
+
 
-
-
-An increasing number of censoring countries are using Deep Packet
-Inspection (DPI) to classify Internet traffic flows by protocol.
-While Tor uses bridge relays to
-get around a censor that blocks by IP address, the censor can use
-DPI to recognize and filter Tor traffic flows even when they connect
-to unexpected IP addresses.
+
+Sometimes the Tor network is censored, and you can't connect it.
+
+
+
+An increasing number of censoring countries are using Deep Packet 
Inspection (DPI) to classify Internet traffic flows by protocol. While Tor uses 
bridge relays to get around a censor that 
blocks by IP address, the censor can use DPI to recognize and filter Tor 
traffic flows even when they connect to unexpected IP addresses.
 
 
-
-Pluggable Transports (PT) transform the Tor traffic flow between the client
-and the bridge. This way, censors who monitor traffic between the
-client and the bridge will see innocent-looking transformed traffic
-instead of the actual Tor traffic.
-External programs can talk to Tor clients and Tor bridges using the https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable
-transport API, to make it easier to build interoperable programs.
+Pluggable Transports help you bypass censorship against Tor.
+
+
+
+Pluggable Transports (PT) transform the Tor traffic flow between the 
client and the bridge. This way, censors who monitor traffic between the client 
and the bridge will see innocent-looking transformed traffic instead of the 
actual Tor traffic. External programs can talk to Tor clients and Tor bridges 
using the https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable 
transport API, to make it easier to build interoperable programs.
 
 
-How to use PTs to bypass censorship
-
-  If connections to the Tor network are being blocked by your ISP or
-  country, follow these instructions:
+
+Here you will learn:
+
+
+
+
+How to use a Pluggable Transport
+How to become a PT bridge operator
+How to become a PT developer
+List of PTs organized by their 
status
+
+
+
+How to use PTs to bypass censorship
+If connections to the Tor network are being blocked by your ISP or 
country, follow these instructions:
 
-
-
+
+ 
 
 
+
+
+
+
+Become a PT brigde operator:
+
 How to run PTs to help censored users
-
-  obfs4 is currently the most effective transport to bypass censorship.
-  To learn how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
+
+
+
+Anyone can set up a PT bridge server and help provide bandwidth to 
users who needs it. Once you set up a transport type, your bridge will 
automatically advertise support for the transport in its descriptor.
+
+obfs4 is currently the most effective transport to 
bypass censorship. We are asking voluntters to run bridges for it.
+To learn how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
 
 
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#BecomeaPTbridgeoperator";>Go
 to our wiki to learn how to set up other types of PTs.
+
+
+
+Become a PT developer:
+
+ The links below are the main documentation that will help guide 
through what you should consider while designing your PT:
+
+
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/GuidelinesForDeployingPTs";>Guidelines
 for deploying Pluggable Transports on Tor Browser
+https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>PT technical 
spec​
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/PTEvaluationCriteria";>Pluggable
 Transports Evaluation Criteria
+
+
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports";>Our
 wiki is also a great source of information, such as how to https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#Waystofollowandjointheconversation:";>get
 in touch with the community, https://trac.torproject.org/projects/tor/wiki/doc/Plugg

[tor-commits] [webwml/staging] Add new Tor Browser version: 6.0.3

[sebastian]

commit a6e00ae60e1720d43bfadbdd31a77969a2e9a54b
Author: Nicolas Vigier 
Date:   Tue Aug 2 20:27:54 2016 +0200

Add new Tor Browser version: 6.0.3
---
 include/versions.wmi   | 22 +++---
 projects/torbrowser/RecommendedTBBVersions |  4 
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index a044ba3..6c5b8f8 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -4,27 +4,27 @@
 0.2.7.6
 
 maint-5.5
-6.0.2
+6.0.3
 6.5a1
 
-6.0.2
-2016-06-21
+6.0.3
+2016-08-02
 6.5a1
 2016-06-07
 
-6.0.2
-2016-06-21
-6.0.2
-2016-06-21
+6.0.3
+2016-08-02
+6.0.3
+2016-08-02
 6.5a1
 2016-06-07
 6.5a1
 2016-06-07
 
-6.0.2
-2016-06-21
-6.0.2
-2016-06-21
+6.0.3
+2016-08-02
+6.0.3
+2016-08-02
 6.5a1
 2016-06-07
 
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index a45ac89..23381ec 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -7,6 +7,10 @@
 "6.0.2-Linux",
 "6.0.2-MacOS",
 "6.0.2-Windows",
+"6.0.3",
+"6.0.3-Linux",
+"6.0.3-MacOS",
+"6.0.3-Windows",
 "6.5a1",
 "6.5a1-Linux",
 "6.5a1-MacOS",



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

[tor-commits] [webwml/staging] Merge pull request #1 from isabelabagueros/pt-updated

[sebastian]

commit 95f432a9c2f7e50ba07172276b60273ad801e018
Merge: c21cddf 41612b5
Author: isabelabagueros 
Date:   Thu Jul 14 22:21:20 2016 -0700

Merge pull request #1 from isabelabagueros/pt-updated

updated pt page organizing content according to audience

 docs/en/pluggable-transports.wml | 235 ---
 1 file changed, 122 insertions(+), 113 deletions(-)



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

[tor-commits] [webwml/staging] replace obfsproxy with PT in projects page and navbar

[sebastian]

commit 8eaa93901ce09178ba260883c0d107820bb306a6
Author: Nima Fatemi 
Date:   Wed Jul 6 22:43:17 2016 +

replace obfsproxy with PT in projects page and navbar
---
 projects/en/projects.wml | 10 ++
 projects/en/sidenav.wmi  | 10 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/projects/en/projects.wml b/projects/en/projects.wml
index b5c844b..985b050 100644
--- a/projects/en/projects.wml
+++ b/projects/en/projects.wml
@@ -52,12 +52,14 @@ default and sends all of its traffic over Tor.
 
 
 
-
 Obfsproxy
-Obfsproxy is a pluggable transports proxy. It shapes Tor traffic,
-making it harder for censors to detect and block the Tor protocol.
+href="">Pluggable Transports
+Pluggable Transports (PT) transform the Tor traffic flow between the client
+and the bridge. This way, censors who monitor traffic between the
+client and the bridge will see innocent-looking transformed traffic
+instead of the actual Tor traffic.
 
 
 
diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi
index 160d20c..4be3c78 100644
--- a/projects/en/sidenav.wmi
+++ b/projects/en/sidenav.wmi
@@ -15,11 +15,11 @@
 #
 # url - the path to the wml page, as used the the  tag. This tag ensures
 # that links will point to the current language if supported, and alternately
-# the english version 
+# the english version
 #
 # txt - the link text to be displayed. Different translations will
-# need to supply alternate txt 
- 
+# need to supply alternate txt
+
 <:
   my $sidenav;
   $sidenav = [
@@ -47,8 +47,8 @@
   {'url'  => 'https://metrics.torproject.org/',
'txt'  => 'Metrics Portal',
   },
-  {'url'  => 'projects/obfsproxy',
-   'txt'  => 'Obfsproxy',
+  {'url'  => 'docs/pluggable-transports',
+   'txt'  => 'Pluggable Transports',
   },
   {'url' => 'https://shadow.cs.umn.edu/',
'txt' => 'Shadow',



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

[tor-commits] [webwml/staging] Alphabet is confusing and line breaks are important

[sebastian]

commit 9beb27b1b75f8db5b7b9a917a4815e3919b60b93
Author: Sebastian Hahn 
Date:   Thu Jul 7 17:39:51 2016 +0200

Alphabet is confusing and line breaks are important
---
 about/en/contributors.wml | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index c912596..563d3de 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -18,17 +18,19 @@
 Alexandre Allaire, Developer
 Helped develop and package Flash Proxy.
 
-Carolyn AnhaltCoordinated translations and translators for
-all of tor's content; website, products, and materials.
-Thomas S. Benjamin
-Anonymous communications and bridge distribution
-researcher. His other work can be found on his http://cryptocracy.net/";>personal website.
+Carolyn Anhalt
+Coordinated translations and translators for all of tor's content;
+website, products, and materials.
 
 Jacob Appelbaum, Advocate, Developer
 Represented Tor at conferences and trainings, and developed tools
 for the Tor ecosystem. Ran one of the Tor directory authorities.
 
+Thomas S. Benjamin
+Anonymous communications and bridge distribution
+researcher. His other work can be found on his http://cryptocracy.net/";>personal website.
+
 Katherine Bergeron
 Helped streamlining our operations, including fundraising, merchandise
 management, travel, and other projects.



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

[tor-commits] [webwml/staging] Merge pull request #2 from isabelabagueros/new_description

[sebastian]

commit 1a75d7f83aa0785561d8bda3e8dae6864fa455bf
Merge: 8f2b64a 3900758
Author: isabelabagueros 
Date:   Sat Jul 16 18:00:35 2016 -0700

Merge pull request #2 from isabelabagueros/new_description

changed for an easier phrase

 include/head.wmi | 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] Attempt to update the stable version to 0.2.8.6.

[sebastian]

commit 4308a4c49f7e8db92a6ee9685ae069927ade3c61
Author: Nick Mathewson 
Date:   Tue Aug 2 15:01:59 2016 -0400

Attempt to update the stable version to 0.2.8.6.
---
 Makefile | 4 ++--
 include/versions.wmi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f266493..4a870ed 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@
 # branch to your personal webwml repository, open a trac ticket in the
 # website component, and set it to needs_review.
 
-export STABLETAG=tor-0.2.7.6
-export DEVTAG=tor-0.2.8.5-rc
+export STABLETAG=tor-0.2.8.6
+#export DEVTAG=tor-0.2.8.5-rc
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index 6e534b5..72a621f 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
-0.2.7.6
-0.2.8.5-rc
+0.2.8.6
+
 
 0.2.7.6
 



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

[tor-commits] [webwml/staging] Fix typo (brigde)

[sebastian]

commit 0c83055974f168d3646a8f1f13ec4ac6f2c03eba
Author: Sebastian Hahn 
Date:   Fri Jul 22 10:50:18 2016 +0200

Fix typo (brigde)

Thanks Andrew McGlashan for the report
---
 docs/en/pluggable-transports.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index d729353..cb487c3 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -66,7 +66,7 @@
 
 
 
-Become a PT brigde operator:
+Become a PT bridge operator:
 
 How to run PTs to help censored users
 



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

[tor-commits] [webwml/staging] Fix up rewrite rules

[sebastian]

commit 9ed889a61c97033442504e96f4525b40b4e0b63b
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:32:23 2016 +0200

Fix up rewrite rules
---
 .htaccess | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index d6d7dc4..407b61f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,9 +32,9 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
 
 #Pluggable Transports
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]
-RewriteRule ^projects/obfsproxy-debian-instructions/$ 
/docs/pluggable-transports [R=410,L]
-RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports 
[R=410,L]
+RewriteRule ^projects/obfsproxy-debian-instructions(.*) 
/docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports 
[R=410,L]
+RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]
 
 # GetInvolved
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]



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

[tor-commits] [webwml/staging] update Linus' entry

[sebastian]

commit 815938fd598dc1305e660355501180e9a3835ecc
Author: Sebastian Hahn 
Date:   Fri Jul 8 16:43:07 2016 +0200

update Linus' entry
---
 about/en/corepeople.wml | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 244b284..9ece58b 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -261,10 +261,9 @@
   website.
 
   Linus Nordberg, Advocate, Developer
-  Swedish advocate for Tor, anonymous communications research,
-  and employee at http://nordu.net/";>NORDUnet. Works
-  on implementing IPv6 in Tor, and helps with build
-  automation. Runs one of the directory authorities.
+  Swedish advocate for Tor, anonymous communications
+  research. Works on implementing IPv6 in Tor, and helps with
+  build automation.  Runs one of the directory authorities.
 
   Donncha O'Cearbhaill, Developer
   Onion services developer, OnionBalance developer,



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

[tor-commits] [webwml/staging] make torproject.org/PT shortlink for PT page

[sebastian]

commit d313e03608f86a0a37dc2dea599a09f8f6280250
Author: Nima Fatemi 
Date:   Wed Jul 6 16:34:48 2016 +

make torproject.org/PT shortlink for PT page
---
 .htaccess | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index bf6a3dc..b85f8ee 100644
--- a/.htaccess
+++ b/.htaccess
@@ -30,6 +30,9 @@ RewriteRule ^press/index.html(.*) /press/press.html$1 
[R=301,L]
 # Projects
 RewriteRule ^projects/$ /projects/projects [R=301,L]
 
+#Pluggable Transports
+RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
+
 # GetInvolved
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]
 RewriteRule ^volunteer(.*) /getinvolved/volunteer$1 [R=301,L]



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

[tor-commits] [webwml/staging] add link to obfs4 instructions

[sebastian]

commit d50ef37e46483fcde8e8d24f81ee864b004521fb
Author: Nima Fatemi 
Date:   Thu Jul 14 18:51:37 2016 +

add link to obfs4 instructions
---
 docs/en/pluggable-transports.wml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 482538f..65cbe45 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -43,6 +43,12 @@ transport API, to make it easier to build interoperable 
programs.
 4-select obfs4 5-press connect" />
 
 
+How to run PTs to help censored users
+
+  obfs4 is currently the most effective transport to bypass censorship.
+  To learn how to run this transport, please visit https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
+
+
 
 
 Currently deployed PTs



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

[tor-commits] [webwml/staging] Capitalize some stuff

[sebastian]

commit d624c28a5623658544e19fda372b3094c5cf5e60
Author: Sebastian Hahn 
Date:   Tue Jul 5 02:26:53 2016 +0200

Capitalize some stuff
---
 docs/en/pluggable-transports.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index d2847f4..d3eb16c 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -126,7 +126,7 @@ transport API, to make it easier to build interoperable 
programs.
 StegoTorus is an Obfsproxy fork that extends it to a)
 split Tor streams across multiple connections to avoid packet size
 signatures, and b) embed the traffic flows in traces that look like
-html, javascript, or pdf. See its
+HTML, JavasCript, or PDF. See its
 https://gitweb.torproject.org/stegotorus.git";>git repository.
 Maintained by Zack Weinberg. 
 



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

[tor-commits] [webwml/staging] add graphic instructions on how to use PTs

[sebastian]

commit f2c6c8aef5dcc41b1fee3afb6037182c7aae873e
Author: Nima Fatemi 
Date:   Tue Jul 12 20:37:02 2016 +

add graphic instructions on how to use PTs
---
 docs/en/pluggable-transports.wml|  12 +++-
 images/PT/2016-07-how-to-use-PT.png | Bin 0 -> 494386 bytes
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 8c55572..482538f 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -32,13 +32,23 @@ 
href="https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable
 transport API, to make it easier to build interoperable programs.
 
 
+How to use PTs to bypass censorship
+
+  If connections to Tor network are being blocked by your ISP or country,
+  follow this instructions:
+
+
+
+
+
 
 
 Currently deployed PTs
 
   These Pluggable Transports are currently deployed in Tor Browser, and 
you can start using them by downloading 
and using Tor Browser.
 
-
 
   
 
diff --git a/images/PT/2016-07-how-to-use-PT.png 
b/images/PT/2016-07-how-to-use-PT.png
new file mode 100644
index 000..0994f04
Binary files /dev/null and b/images/PT/2016-07-how-to-use-PT.png differ



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

[tor-commits] [webwml/staging] Direct RPM users to Fedora/EPEL packages

[sebastian]

commit 5134510306dddc923a792e7e26d896564433ae2c
Author: Ondrej Mikle 
Date:   Tue Jul 5 22:09:31 2016 +0200

Direct RPM users to Fedora/EPEL packages
---
 docs/en/rpms.wml | 100 ++-
 1 file changed, 3 insertions(+), 97 deletions(-)

diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml
index 158f9fa..7d9c3f3 100644
--- a/docs/en/rpms.wml
+++ b/docs/en/rpms.wml
@@ -15,106 +15,12 @@
 linux distributions.
 
 
-Do not use the packages in the native repositories. 
They are
-frequently out of date. That means you'll be missing stability and
-security fixes.
-
-
-
-You'll need to set up our package repository before you can fetch
-Tor. Repositories contain i686 and x86_64 builds. Assuming yum, in
-/etc/yum.repos.d/, create a file called
-torproject.repo.  Edit this file with the following information:
-
-
-Fedora 22/23 and EL6/7 packages
+Fedora, RHEL, CentOS, Scientific Linux packages
 
-For Fedora 22, Fedora 23, RHEL 6, RHEL 7 (and clones), use following
-repo file - substitute DISTRIBUTION with one of the following: fc/22, 
fc/23,
-el/6, el/7 according to your distribution.
-
-
-[tor]
-name=Tor repo
-enabled=1
-baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/$basearch/
-gpgcheck=1
-gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
-repo_gpgcheck=1
-
-[tor-source]
-name=Tor source repo
-enabled=1
-autorefresh=0
-baseurl=https://deb.torproject.org/torproject.org/rpm/DISTRIBUTION/SRPMS
-gpgcheck=1
-gpgkey=https://deb.torproject.org/torproject.org/rpm/RPM-GPG-KEY-torproject.org.asc
-repo_gpgcheck=1
-
-
-The key's fingerprint should be:
+Use native Fedora packages for Fedora distribution or https://fedoraproject.org/wiki/EPEL";>EPEL 
+packages for distribitons derived from RHEL.
 
-E273 44C4 BD24 BEDF E4F4  C741 803F EFB7 F4B8 5E0F
 
-Name clash warning
-
-There is identically named 'tor' package in the EPEL and Fedora
-repositories. Due to this unfortunate name clash, the packages might
-"update over one another", depending on patchversion.  Solution is to use
-Exclude=tor line in the relevant /etc/yum.repos.d/
-file.
- 
-
-E.g. you may exclude EPEL's Tor package by putting the mentioned exclude
-line under [epel] section in /etc/yum.repos.d/epel.repo.
-For Fedora, you usually need that exclude in fedora.repo and
-fedora-updates.repo file.
-
-
-Package installation and running
-
-
-Once you have the repo file, install Tor using (yum will ask about the
-key's fingerprint the first time):
-
-yum install tor
-
-
-Start Tor using:
-
-service tor start
-
-
-Now Tor is installed and running. Move on to step two of the "Tor on Linux/Unix"
-instructions.
-
-
-
-The DNS name deb.torproject.org is actually a set of 
independent
-servers in a DNS round-robin configuration.  If for some reason you cannot
-use it, you might be able to access one of the individual servers
-instead.  Try
-deb-master.torproject.org,
-mirror.netcologne.de or
-tor.mirror.youam.de.
-
-
-
-
-
-
-Alpha/development packages
-
-
-
-There is a repository that contains packages for latest alpha branch of 
Tor.
-If you'd like to experiment with them, use one of the above repo files, 
just
-change the baseurl to (similarly to previous section, substitute
-DISTRIBUTION based on your distribution; for source rpms use "SRPMS" 
instead
-of $basearch):
-
-baseurl=https://deb.torproject.org/torproject.org/rpm/tor-testing/DISTRIBUTION/$basearch/
 
 
 Building from source



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

[tor-commits] [webwml/staging] New release candidate (source).

[sebastian]

commit 16bb4da7cf14a5780917af53706dce97c9ac76aa
Author: Nick Mathewson 
Date:   Thu Jul 7 12:40:46 2016 -0400

New release candidate (source).
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9e24d60..f266493 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.2.7.6
-export DEVTAG=tor-0.2.8.4-rc
+export DEVTAG=tor-0.2.8.5-rc
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index c1cae5d..a044ba3 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.2.7.6
-0.2.8.4-rc
+0.2.8.5-rc
 
 0.2.7.6
 



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

[tor-commits] [webwml/staging] rpms.wml spelling

[sebastian]

commit eb2d38ed448b5891fbe9bd4263b89c120045f3d7
Author: Sebastian Hahn 
Date:   Thu Jul 7 00:12:00 2016 +0200

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

diff --git a/docs/en/rpms.wml b/docs/en/rpms.wml
index 7d9c3f3..cf779c6 100644
--- a/docs/en/rpms.wml
+++ b/docs/en/rpms.wml
@@ -17,7 +17,7 @@
 
 Fedora, RHEL, CentOS, Scientific Linux packages
 
-Use native Fedora packages for Fedora distribution or https://fedoraproject.org/wiki/EPEL";>EPEL 
+Use native Fedora packages for the Fedora distribution or https://fedoraproject.org/wiki/EPEL";>EPEL
 packages for distribitons derived from RHEL.
 
 



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

[tor-commits] [webwml/staging] add breaks after h3 titles

[sebastian]

commit 0a66410984ea6b81b4895610bb19b674dc57176e
Author: Nima Fatemi 
Date:   Wed Jul 6 21:58:41 2016 +

add breaks after h3 titles
---
 docs/en/pluggable-transports.wml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index d3eb16c..8c55572 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -91,7 +91,7 @@ transport API, to make it easier to build interoperable 
programs.
   
 
   Deprecated PTs; Removed from Tor Browser
-
+  
   
 
 Obfsproxy is a 
Python framework for implementing new
@@ -119,6 +119,7 @@ transport API, to make it easier to build interoperable 
programs.
   
 
   Undeployed PTs
+  
   
   
 



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

[tor-commits] [webwml/staging] Add Jake to past contributors page

[sebastian]

commit 01f582bdb08f2b77cd845aaa0c4f152e25c2aece
Author: Sebastian Hahn 
Date:   Thu Jul 7 12:29:34 2016 +0200

Add Jake to past contributors page
---
 about/en/contributors.wml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index dadb568..31be450 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -25,6 +25,11 @@ all of tor's content; website, products, and materials.
 researcher. His other work can be found on his http://cryptocracy.net/";>personal website.
 
+Jacob Appelbaum, Advocate, Developer
+Represented Tor at conferences and trainings, and developed tools
+for the Tor ecosystem. Used to run one of the Tor directory
+authorities.
+
 Katherine Bergeron
 Helped streamlining our operations, including fundraising, merchandise
 management, travel, and other projects.



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

[tor-commits] [webwml/staging] Fix up PT changes

[sebastian]

commit 44c667ecd025ecb10a332551c4051b0533db6a7a
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:20:36 2016 +0200

Fix up PT changes
---
 .htaccess |   2 +-
 docs/en/pluggable-transports.wml  |   6 +-
 projects/en/obfsproxy-debian-instructions.wml | 150 ---
 projects/en/obfsproxy-instructions.wml| 164 --
 projects/en/obfsproxy.wml | 102 
 5 files changed, 4 insertions(+), 420 deletions(-)

diff --git a/.htaccess b/.htaccess
index c896fe6..d6d7dc4 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,7 +32,7 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
 
 #Pluggable Transports
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]
 RewriteRule ^projects/obfsproxy-debian-instructions/$ 
/docs/pluggable-transports [R=410,L]
 RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports 
[R=410,L]
 
diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 65cbe45..99d3c3b 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -34,8 +34,8 @@ transport API, to make it easier to build interoperable 
programs.
 
 How to use PTs to bypass censorship
 
-  If connections to Tor network are being blocked by your ISP or country,
-  follow this instructions:
+  If connections to the Tor network are being blocked by your ISP or
+  country, follow these instructions:
 
 
 , to make it easier to build interoperable 
programs.
 How to run PTs to help censored users
 
   obfs4 is currently the most effective transport to bypass censorship.
-  To learn how to run this transport, please visit https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
+  To learn how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
 
 
 
diff --git a/projects/en/obfsproxy-debian-instructions.wml 
b/projects/en/obfsproxy-debian-instructions.wml
deleted file mode 100644
index 4911bc5..000
--- a/projects/en/obfsproxy-debian-instructions.wml
+++ /dev/null
@@ -1,150 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 4-optional
-
-#include "head.wmi" TITLE="obfsproxy: Setting up an Obfsproxy Bridge on 
Debian/Ubuntu" CHARSET="UTF-8"
-
-
-  
-Home » 
-Projects » 
-obfsproxy
-  
-  
-
-
-
-Setting up an Obfsproxy Bridge on Debian/Ubuntu
-
-
-
-
-
- Hey! 
-If you are not using Debian or Ubuntu, you better look
-at this other guide
-which sets up Obfsproxy from source.
-
-
-
-
-
-  This is a Debian/Ubuntu guide for installing the Python
-  version of obfsproxy. If you are still using the C version, we
-  recommend you to upgrade to the Python version!
-
-
-Step 0: Install a recent version of Tor (>= 0.2.4.1)
-
-
-
-Add the official Tor
-APT repository and run the specified commands to install 
tor
-and deb.torproject.org-keyring. You need Tor 0.2.4.x 
because
-it knows how to automatically report your obfsproxy address to https://bridges.torproject.org/?transport=obfs3";>BridgeDB.
-
-
-Step 1: Install obfsproxy
-
-
-
-Since you installed the Tor APT repository, installing obfsproxy is now a 
matter of running a command:
-
-
-
-\# apt-get install obfsproxy
-
-
-Step 2: Configure Tor
-
-
-
-Edit your /etc/tor/torrc to add:
-
-
-
-SocksPort 0
-ORPort auto
-BridgeRelay 1
-Exitpolicy reject *:*
-
-\## CHANGEME_1 -> provide a nickname for your bridge, can be anything you like
-\#Nickname CHANGEME_1
-\## CHANGEME_2 -> provide some email address so we can contact you if there's 
a problem
-\#ContactInfo CHANGEME_2
-
-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
-
-
-
-Don't forget to uncomment and edit the CHANGEME fields!
-
-
-Step 3: Launch Tor and verify that it bootstraps
-
-
-
-Restart Tor to use the new configuration file.
-(Preface with sudo if needed.)
-
-
-
-\# service tor restart
-
-
-
-Now check /var/log/tor/log and you should see something
-like this:
-
-
-
-Nov 05 16:40:45.000 [notice] We now have enough directory information to build 
circuits.
-Nov 05 16:40:45.000 [notice] Bootstrapped 80%: Connecting to the Tor network.
-Nov 05 16:40:46.000 [notice] Bootstrapped 85%: Finishing handshake with first 
hop.
-Nov 05 16:40:46.000 [notice] Bootstrapped 90%: Establishing a Tor circuit.
-Nov 05 16:40:48.000 [notice] Tor has successfully opened a c

[tor-commits] [webwml/staging] Add Sukhbir's key to signing key page (#18512)

[sebastian]

commit e4449a5e9b09f2b475cd05be49d6fe11f7035360
Author: Sukhbir Singh 
Date:   Fri Jun 24 11:28:17 2016 -0400

Add Sukhbir's key to signing key page (#18512)
---
 docs/en/signing-keys.wml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index f169d36..a708aa3 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -26,6 +26,7 @@
 Damian Johnson (0x9ABBEEC6) signs Arm releases.
 The Tails team (0x58ACD84F) signs the Tails live system releases.
 David Goulet (0x42E86A2A11F48D36) signs Torsocks releases.
+Sukhbir Singh (0xB01C8B006DA77FAA) signs Tor Messenger and TorBirdy 
releases.
 Other developers include Peter Palfrader (0xC82E0039, or its
 subkey 0xE1DEC577) and Jacob Appelbaum (0xFA7F0E44D487F03F).
 
@@ -127,6 +128,12 @@
 sub   4096g/FE9D6620 2011-05-11 [expires: 2016-05-09]
 sub   4096R/93CC198D 2013-09-10 [expires: 2016-09-10]
 
+pub   4096R/0xB01C8B006DA77FAA 2016-02-25 [expires: 2020-02-24]
+  Key fingerprint = E4AC D397 5427 A5BA 8450  A1BE B01C 8B00 6DA7 7FAA
+uidSukhbir Singh 
+uidSukhbir Singh 
+sub   4096R/0x1AF20C043D9F9289 2016-02-25 [expires: 2020-02-24]
+
 pub   4096R/58ACD84F 2015-01-18 [expires: 2017-01-11]
   Key fingerprint = A490 D0F4 D311 A415 3E2B  B7CA DBB8 02B2 58AC D84F
 uid  Tails developers 



___
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 Tor Browser version: 6.0.2

[sebastian]

commit aeb30f85736b850b3a65af529f7bcd9d4672373f
Author: Nicolas Vigier 
Date:   Tue Jun 21 15:20:29 2016 +0200

Add new Tor Browser version: 6.0.2
---
 include/versions.wmi   | 22 +++---
 projects/torbrowser/RecommendedTBBVersions |  4 
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index f4b1c05..c1cae5d 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -4,27 +4,27 @@
 0.2.7.6
 
 maint-5.5
-6.0.1
+6.0.2
 6.5a1
 
-6.0.1
-2016-06-07
+6.0.2
+2016-06-21
 6.5a1
 2016-06-07
 
-6.0.1
-2016-06-07
-6.0.1
-2016-06-07
+6.0.2
+2016-06-21
+6.0.2
+2016-06-21
 6.5a1
 2016-06-07
 6.5a1
 2016-06-07
 
-6.0.1
-2016-06-07
-6.0.1
-2016-06-07
+6.0.2
+2016-06-21
+6.0.2
+2016-06-21
 6.5a1
 2016-06-07
 
diff --git a/projects/torbrowser/RecommendedTBBVersions 
b/projects/torbrowser/RecommendedTBBVersions
index 785e8c2..a45ac89 100644
--- a/projects/torbrowser/RecommendedTBBVersions
+++ b/projects/torbrowser/RecommendedTBBVersions
@@ -3,6 +3,10 @@
 "6.0.1-Linux",
 "6.0.1-MacOS",
 "6.0.1-Windows",
+"6.0.2",
+"6.0.2-Linux",
+"6.0.2-MacOS",
+"6.0.2-Windows",
 "6.5a1",
 "6.5a1-Linux",
 "6.5a1-MacOS",



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

[tor-commits] [webwml/staging] Various changes on Pluggable Transports page:

[sebastian]

commit b5234779299ce73d88a1c71951d7ed7167635b7b
Author: Nima Fatemi 
Date:   Fri Jul 1 23:09:59 2016 +

Various changes on Pluggable Transports page:

  - Broken the lists in three different sections:
'deployed', 'deprecated' and 'undeployed'
with a plan to move the last two sections to wiki.
  - Style fixes: It's either 'Pluggable Transports' or 'PT' or 'PTs'.
  - Added todo notes for later.
  - Style fix: it's 'meek' not 'Meek'.
  - Removed download section. It's either included in TB or not.
  - Removed 'status'.
  - Commented out 'obfsclient' since its status is unknown.
---
 docs/en/pluggable-transports.wml | 171 ---
 1 file changed, 89 insertions(+), 82 deletions(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 45c07d9..d2847f4 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -23,7 +23,7 @@
 
 
 
-Pluggable transports transform the Tor traffic flow between the client
+Pluggable Transports (PT) transform the Tor traffic flow between the client
 and the bridge. This way, censors who monitor traffic between the
 client and the bridge will see innocent-looking transformed traffic
 instead of the actual Tor traffic.
@@ -34,82 +34,101 @@ transport API, to make it easier to build 
interoperable programs.
 
 
 
+Currently deployed PTs
+
+  These Pluggable Transports are currently deployed in Tor Browser, and 
you can start using them by downloading 
and using Tor Browser.
+
+
+
+  
+
+https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt";>obfs4
+is a transport with the same features as http://www.cs.kau.se/philwint/scramblesuit/";>ScrambleSuit
+but utilizing Dan Bernstein's http://elligator.cr.yp.to/elligator-20130828.pdf";>elligator2
+technique for public key obfuscation, and the
+https://gitweb.torproject.org/torspec.git/tree/proposals/216-ntor-handshake.txt";>ntor
 protocol
+for one-way authentication. This results in a faster protocol. Written 
in Go.
+Maintained by Yawning Angel.
+
+
+
+https://trac.torproject.org/projects/tor/wiki/doc/meek";>meek
+is a transport that uses HTTP for carrying bytes and TLS for
+obfuscation. Traffic is relayed through a third-party server
+(​Google App Engine). It uses a trick to talk to the third party so
+that it looks like it is talking to an unblocked server.
+Maintained by David Fifield.
+
+
+
+https://fteproxy.org/";>Format-Transforming
+Encryption (FTE) transforms Tor traffic to arbitrary
+formats using their language descriptions. See the https://kpdyer.com/publications/ccs2013-fte.pdf";>research
+paper.
+
+http://www.cs.kau.se/philwint/scramblesuit/";>ScrambleSuit
+is a pluggable transport that protects
+against follow-up probing attacks and is also capable of changing
+its network fingerprint (packet length distribution,
+inter-arrival times, etc.). It's part of the Obfsproxy framework.
+Maintained by Philipp Winter.
+
+
+
+
+
+  
+
+  
+
+  Deprecated PTs; Removed from Tor Browser
+
+  
+
+Obfsproxy is a 
Python framework for implementing new
+pluggable transports. It uses Twisted for its networking needs, and
+https://gitweb.torproject.org/pluggable-transports/pyptlib.git/tree/README.rst";>pyptlib
+for some pluggable transport-related features. It supports the
+https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/tree/doc/obfs2/obfs2-protocol-spec.txt";>obfs2
+and
+https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/tree/doc/obfs3/obfs3-protocol-spec.txt";>obfs3
+pluggable transports. Maintained by asn.
+
+
+https://crypto.stanford.edu/flashproxy/";>Flashproxy turns 
ordinary web browsers into bridges using
+websockets, and has a little python stub to hook Tor clients to the
+websocket connection. See its
+https://gitweb.torproject.org/flashproxy.git";>git 
repository,
+and
+https://crypto.stanford.edu/flashproxy/flashproxy.pdf";>design 
paper.
+Maintained by David Fifield.
+
+
+
+  
+
+  
+
+  Undeployed PTs
+  
+  
 
 
-Obfsproxy is a Python 
framework for implementing new
-pluggable transports. It uses Twisted for its networking needs, and
-https://gitweb.torproject.org/pluggable-transports/pyptlib.git/tree/README.rst";>pyptlib
-for some pluggable transport-related features. It supports the
-https://gitweb.torproject.org/pluggable-transports/obfsproxy.git/tree/doc/obfs2/obfs2-protocol-spec.txt";>obfs2
-and
-https://gitweb.torproject.org/pluggabl

[tor-commits] [webwml/staging] Add arthuredelstein to the core people page

[sebastian]

commit 488477ba4fd67f80c0065492cd07e207f9fcd277
Author: Sebastian Hahn 
Date:   Wed Jun 22 20:10:12 2016 +0200

Add arthuredelstein to the core people page
---
 about/en/corepeople.wml | 4 
 1 file changed, 4 insertions(+)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 2d071db..baf7fe6 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -78,6 +78,10 @@
   explain what Tor is and can do. Helps coordinate academic
   researchers. Runs one of the directory authorities.
 
+  Arthur Edelstein
+  Arthur Edelstein, Developer -- Works on Tor Browser and
+  Torbutton.
+
   Nima Fatemi, Advocate
   Usability team, Farsi advocate, https://libraryfreedomproject.org/";>Library Freedom



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

[tor-commits] [webwml/staging] tup isn't our only pseudonym anymore

[sebastian]

commit 34d753af205e14f542fd0c4ee354041812b72b8a
Author: Sebastian Hahn 
Date:   Thu Jul 7 12:43:17 2016 +0200

tup isn't our only pseudonym anymore
---
 about/en/contributors.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index 31be450..e90052d 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -170,8 +170,8 @@ href="">Torbutton.
 Worked on the artwork and design for various projects,
 annual reports, and brochures.
 
-tup (a pseudonym)Added new features for
-making Tor easier to use as a tup
+Added new features for making Tor easier to use as a transparent
 proxy. Also wrote the http://p56soo2ibjkx23xo.onion/";>TorDNSEL code.



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

[tor-commits] [webwml/staging] Update Erin's blurb. Cookies much important

[sebastian]

commit e9f62b1569ab3888c9845cca1a1cc0a2235e0438
Author: Sebastian Hahn 
Date:   Fri Jun 24 01:29:19 2016 +0200

Update Erin's blurb. Cookies much important
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 14a2f8f..e7d2c0b 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -363,7 +363,7 @@
   Princeton.
 
   Erin Wyatt, HR Manager
-  Based in the Seattle office.
+  Employee benefits, policy questions, and baked goods.
 
   Yawning, Developer
   Lead developer on obfs4proxy and other pluggable transports.



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

[tor-commits] [webwml/staging] s/txttorcon/txtorcon/

[sebastian]

commit d8815950f3e3fe0a8dbbcc817e0ac8ada948af18
Author: Sebastian Hahn 
Date:   Mon Jun 27 12:39:46 2016 +0200

s/txttorcon/txtorcon/
---
 about/en/corepeople.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index c55be8b..a6a362d 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -325,7 +325,7 @@
   and maintains Tor Launcher and Torbutton.
 
   David Stainton, Developer
-  David contributes code to txttorcon (onion service
+  David contributes code to txtorcon (onion service
   endpoint), authored roflcopter (tor control port filter
   daemon) and HoneyBadger (TCP injection attack detector). He
   also analyzes the Tor network for attacks.



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

[tor-commits] [webwml/staging] Attempt to get rid of visible directory indices

[sebastian]

commit 94454cc9023e29377751eb67da460ce19a0fa5e6
Author: Sebastian Hahn 
Date:   Tue Jun 28 00:12:06 2016 +0200

Attempt to get rid of visible directory indices
---
 .htaccess | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/.htaccess b/.htaccess
index 73a8e95..bf6a3dc 100644
--- a/.htaccess
+++ b/.htaccess
@@ -51,6 +51,17 @@ RewriteRule ^easy-download(.*) /download/download-easy$1 
[R=301,L]
 # Relays
 RewriteRule ^relays(.*) /getinvolved/relays [R=301,L]
 
+# Index Pages
+RewriteRule ^about/$ /about/overview [R=301,L]
+RewriteRule ^cgi-bin/$ / [R=301,L]
+RewriteRule ^css/$ / [R=301,L]
+RewriteRule ^docs/$ /docs/documentation [R=301,L]
+RewriteRule ^eff/$ / [R=301,L]
+RewriteRule ^en/$ / [R=301,L]
+RewriteRule ^images/$ / [R=301,L]
+RewriteRule ^include/$ / [R=301,L]
+RewriteRule ^js/$ / [R=301,L]
+
 # Donation campagin
 RewriteRule ^donate/donate-twitter(.*) /donate/donate$1 [R=302,L]
 RewriteRule ^donate/donate-tbb(.*) /donate/donate$1 [R=302,L]



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

[tor-commits] [webwml/staging] Used to run -> Ran

[sebastian]

commit 452d1290e5aeff12c6e19876f8f6fa6cd2d4f724
Author: Sebastian Hahn 
Date:   Thu Jul 7 16:49:04 2016 +0200

Used to run -> Ran
---
 about/en/contributors.wml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index e90052d..c912596 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -27,8 +27,7 @@ href="http://cryptocracy.net/";>personal website.
 
 Jacob Appelbaum, Advocate, Developer
 Represented Tor at conferences and trainings, and developed tools
-for the Tor ecosystem. Used to run one of the Tor directory
-authorities.
+for the Tor ecosystem. Ran one of the Tor directory authorities.
 
 Katherine Bergeron
 Helped streamlining our operations, including fundraising, merchandise



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

[tor-commits] [webwml/staging] Update dgoulet's key info

[sebastian]

commit 15af147b33ae41106c2ab6d8de90bd36d166c05e
Author: Sebastian Hahn 
Date:   Thu Jul 7 07:03:48 2016 +0200

Update dgoulet's key info
---
 docs/en/signing-keys.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index a708aa3..06ef0a4 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -122,10 +122,10 @@
 sub   4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25]
 sub   4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25]
 
-pub   2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2016-05-09]
+pub   2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2017-05-09]
   Key fingerprint = B744 17ED DF22 AC9F 9E90  F491 42E8 6A2A 11F4 8D36
 uidDavid Goulet <dgou...@torproject.org>
-sub   4096g/FE9D6620 2011-05-11 [expires: 2016-05-09]
+sub   4096g/FE9D6620 2011-05-11 [expires: 2017-05-09]
 sub   4096R/93CC198D 2013-09-10 [expires: 2016-09-10]
 
 pub   4096R/0xB01C8B006DA77FAA 2016-02-25 [expires: 2020-02-24]



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

[tor-commits] [webwml/staging] Move Leiah to past contributors

[sebastian]

commit ad347f4014b77629c833a753f88eb47ac0785bf9
Author: Sebastian Hahn 
Date:   Fri Jul 1 17:41:40 2016 +0200

Move Leiah to past contributors
---
 about/en/contributors.wml | 4 
 about/en/corepeople.wml   | 4 
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index 14ffe38..dadb568 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -105,6 +105,10 @@ scripts, and other useful peripheral tools.
 Dr. Nick Hopper, Researcher
 Cryptographer, privacy expert, and professor.
 
+Leiah Jansen, Graphic Designer
+Helped make our cool logos, designs, stickers, graphics, and so on.
+Invented the awesome "roots" Tor logo.
+
 Christian King Worked during the 2007 Google Summer of Code
 on making Tor relays stable on
 Windows, by developing a https://bridges.torproject.org/";>BridgeDB. Used to
   work on OONI.
 
-  Leiah Jansen, Designer
-  Helps make all of our cool logos, designs, stickers, graphics,
-  and so on. Invented the awesome new "roots" Tor logo.
-
   Dr. Rob Jansen, Researcher
   Lead developer for https://shadow.cs.umn.edu/";>Shadow,



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

[tor-commits] [webwml/staging] Update BridgeDB's volunteer page link

[sebastian]

commit 0e9be9a2e7b94a30bb4bf00c743cd3539ead5571
Author: Damian Johnson 
Date:   Wed Jun 22 08:33:39 2016 -0700

Update BridgeDB's volunteer page link

Isis recently mentioned this site. Much better than linking to its old 
roadmap.
---
 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 8aa3707..8d9335d 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -730,7 +730,7 @@ meetings around the world.
 
 
 
-https://trac.torproject.org/projects/tor/wiki/org/roadmaps/BridgeDB";>BridgeDB
 (https://pythonhosted.org/bridgedb/";>BridgeDB (https://gitweb.torproject.org/bridgedb.git";>code, https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Obfuscation%2FBridgeDB&order=priority";>bug
 tracker)



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

[tor-commits] [webwml/staging] Remove rule 41 banner include

[sebastian]

commit 84d2b92b982a2fe5b3ebd5ea2866c5cceb16c149
Author: Sebastian Hahn 
Date:   Thu Jun 23 01:16:25 2016 +0200

Remove rule 41 banner include
---
 include/head.wmi | 15 ---
 1 file changed, 15 deletions(-)

diff --git a/include/head.wmi b/include/head.wmi
index 7dd267a..f354839 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -39,21 +39,6 @@

-
- 
 
 
 



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

[tor-commits] [webwml/staging] redirect old obfsproxy pages to PT page

[sebastian]

commit ff7363907c0a9ec1b4b7d12115ee8a2604ce6f38
Author: Nima Fatemi 
Date:   Wed Jul 6 22:03:52 2016 +

redirect old obfsproxy pages to PT page
---
 .htaccess | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.htaccess b/.htaccess
index b85f8ee..c896fe6 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,6 +32,9 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
 
 #Pluggable Transports
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
+RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy-debian-instructions/$ 
/docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports 
[R=410,L]
 
 # GetInvolved
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]



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

[tor-commits] [webwml/staging] Remove link to same page via redirects

[sebastian]

commit f1819af6f6be1c09cbd31eab8525359356673a0c
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:22:39 2016 +0200

Remove link to same page via redirects
---
 docs/en/pluggable-transports.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 99d3c3b..3cd7033 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -110,7 +110,7 @@ transport API, to make it easier to build interoperable 
programs.
   
   
 
-Obfsproxy is a 
Python framework for implementing new
+Obfsproxy is a Python framework for implementing new
 pluggable transports. It uses Twisted for its networking needs, and
 https://gitweb.torproject.org/pluggable-transports/pyptlib.git/tree/README.rst";>pyptlib
 for some pluggable transport-related features. It supports the



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

[tor-commits] [webwml/staging] Mike doesn't run a dirauth anymore

[sebastian]

commit bf4ebed0fa01b685b5402e016ac9e90c42bccfd0
Author: Sebastian Hahn 
Date:   Thu Jul 7 00:10:23 2016 +0200

Mike doesn't run a dirauth anymore
---
 about/en/corepeople.wml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 015c23b..244b284 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -277,8 +277,7 @@
   Mike Perry, Tor Browser and Tor Performance
   Developer Lead developer on Tor Browser, developer
   of Torbutton, author of https://gitweb.torproject.org/torflow.git/tree/README";>TorFlow.
-  Runs one of the directory authorities.
+  
href="https://gitweb.torproject.org/torflow.git/tree/README";>TorFlow.
 
   Fabio Pietrosanti, Advocate and Developer
   Originally involved with Tor2Web, and is now our connection



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

[tor-commits] [webwml/staging] Fix Arthur's entry

[sebastian]

commit ee329ba275974b99cfe336716a56bc5bf22532cd
Author: Sebastian Hahn 
Date:   Thu Jun 23 03:12:40 2016 +0200

Fix Arthur's entry
---
 about/en/corepeople.wml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index baf7fe6..5413c03 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -78,9 +78,8 @@
   explain what Tor is and can do. Helps coordinate academic
   researchers. Runs one of the directory authorities.
 
-  Arthur Edelstein
-  Arthur Edelstein, Developer -- Works on Tor Browser and
-  Torbutton.
+  Arthur Edelstein, Developer
+  Works on Tor Browser and Torbutton.
 
   Nima Fatemi, Advocate
   Usability team, Farsi advocate, https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/staging] Remove mentions of weather on tshirt page (#19354)

[sebastian]

commit 9b7c479c68182c5d572284d6fb3c4fbd4b8fe8c2
Author: Sebastian Hahn 
Date:   Tue Jun 21 05:49:47 2016 +0200

Remove mentions of weather on tshirt page (#19354)
---
 getinvolved/en/tshirt.wml | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/getinvolved/en/tshirt.wml b/getinvolved/en/tshirt.wml
index 771a81d..7d6336c 100644
--- a/getinvolved/en/tshirt.wml
+++ b/getinvolved/en/tshirt.wml
@@ -17,7 +17,6 @@
 Tor project. There are three primary ways of contributing:
 
 
-During our end-of-the-year (2015) fundraising campaign, you can get a 
special, campaign t-shirt or other cool swag by donating to the Tor Project.
 Operate a fast Tor relay
 that's been running for the past two months: you are eligible if you
 allow exits to port 80 and you average 250 KBytes/s traffic, or if you're
@@ -33,14 +32,7 @@
 
 
 
-The https://weather.torproject.org/";>Tor Weather
-system watches all of the relays. If you have a valid email address
-(lightly obfuscated is acceptable) in your ContactInfo field,
-we'll automatically email you when your relay earns you a t-shirt.
-
-
-
-If you get such a mail, or you've done something else cool, email
+If you're operating a fast relay or you've done something else cool, email
 us at tsh...@torproject.org with the details. (We want to make sure
 our shirts help outreach happen all around the world, so please
 understand if we can't send you 5 shirts for your 5 excellent relays.)



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

[tor-commits] [webwml/staging] Add ewyatt to core people

[sebastian]

commit 28d5d360b651288c53e7670d20d1a84f4c5ccdae
Author: Sebastian Hahn 
Date:   Fri Jun 24 01:13:43 2016 +0200

Add ewyatt to core people
---
 about/en/corepeople.wml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 2e13483..14a2f8f 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -362,6 +362,9 @@
   and part of the pluggable transports team. Post-doc at
   Princeton.
 
+  Erin Wyatt, HR Manager
+  Based in the Seattle office.
+
   Yawning, Developer
   Lead developer on obfs4proxy and other pluggable transports.
   Part of the pluggable transports team.



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

[tor-commits] [webwml/staging] Update OFTC link.

[sebastian]

commit 037859bf9ec2e69d80e60ab83075e15edabff5e6
Author: Sebastian Hahn 
Date:   Tue Jun 21 05:44:32 2016 +0200

Update OFTC link.

Patch credit goes to cypherpunks on #19165
---
 about/en/contact.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/contact.wml b/about/en/contact.wml
index d3a93e6..1668cbd 100644
--- a/about/en/contact.wml
+++ b/about/en/contact.wml
@@ -62,7 +62,7 @@
 
 IRC
 Tor users and developers can also be found in the following channels on 
http://www.oftc.net/oftc/";>OFTC:
+href="https://www.oftc.net/";>OFTC:
 
 
   #tor - For questions about using Tor (as a client, as



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

[tor-commits] [webwml/staging] Remove instructions for bypassing Gatekeeper on OS X.

[sebastian]

commit 3ea8bacac8ec07259b5728b42b5a4f36736d21bb
Author: David Fifield 
Date:   Wed Jun 1 15:18:11 2016 -0700

Remove instructions for bypassing Gatekeeper on OS X.

Tor Browser now works with Gatekeeper (#6540).

These instructions were originally added for #14838.

This reverts commit 8c308cd6ef7c95b28cf0fc2c4afa1ebf601cd200.
This reverts commit 3b647388ec91070e307a9e508f2d7ac597c799d8.
This reverts commit 1e96f7e96f192dd341854b5b9ac709775f9a2a50.
---
 css/layout.css|  14 --
 download/en/download-easy.wml |  18 --
 images/tbb-macosx-step-1.png  | Bin 21334 -> 0 bytes
 images/tbb-macosx-step-2.png  | Bin 20451 -> 0 bytes
 images/tbb-macosx-step-3.png  | Bin 13846 -> 0 bytes
 projects/en/torbrowser.wml|   5 +
 6 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/css/layout.css b/css/layout.css
index c65126b..8a79d9d 100644
--- a/css/layout.css
+++ b/css/layout.css
@@ -660,20 +660,6 @@ table tr img {
padding-bottom: 8px;
 }
 
-.howto th, .howto td {
-   padding: 2px;
-}
-
-.howto th {
-   font-weight: bold;
-   text-align: center;
-}
-
-.howto img {
-   border: 0;
-   margin: 0;
-}
-
 #download-donate {
background-attachment: scroll;
background-clip: border-box;
diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 7a85413..4bb1517 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -75,24 +75,6 @@
  
  Not Using Mac? Download for Windows or Linux
 
-
-
-  
-1. Install
-2. Control-click
-3. Open
-  
-  
-
-
-
-  
-  
-Drag the Tor Browser icon to the Applications folder and open 
the Applications folder.
-Control-click on the Tor Browser icon (click the mouse button 
while pressing the Control key on the keyboard) and choose 
“Open”.
-Click “Open” on the next screen.
-  
-
   
 
   
diff --git a/images/tbb-macosx-step-1.png b/images/tbb-macosx-step-1.png
deleted file mode 100644
index 2dd11fc..000
Binary files a/images/tbb-macosx-step-1.png and /dev/null differ
diff --git a/images/tbb-macosx-step-2.png b/images/tbb-macosx-step-2.png
deleted file mode 100644
index 40f6f92..000
Binary files a/images/tbb-macosx-step-2.png and /dev/null differ
diff --git a/images/tbb-macosx-step-3.png b/images/tbb-macosx-step-3.png
deleted file mode 100644
index 27e98cf..000
Binary files a/images/tbb-macosx-step-3.png and /dev/null differ
diff --git a/projects/en/torbrowser.wml b/projects/en/torbrowser.wml
index 15ef9e9..261973a 100644
--- a/projects/en/torbrowser.wml
+++ b/projects/en/torbrowser.wml
@@ -570,10 +570,7 @@
 Mac OS X Instructions
 
   Download the file above, save it somewhere, then click on it.
-  This opens the .dmg file. (On recent versions of OS X, you might get
-  a warning that it's from an "unidentified developer" — you can
-  get around this complaint by 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".)
-  Drag the included file into your Applications folder and you will
+  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.
 



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

[tor-commits] [webwml/staging] update teor's entry

[sebastian]

commit dafc9f8b7b31b173639bc51015a37a2a49fd47b4
Author: Sebastian Hahn 
Date:   Sat Jul 2 11:05:11 2016 +0200

update teor's entry
---
 about/en/corepeople.wml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index a3318aa..015c23b 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -358,9 +358,10 @@
   Working on build automation, particularly around the Tor
   Browser.
 
-  Tim Wilson-Brown, Developer
-  Onion services developer, and core member of Tor development
-  team.
+  Tim Wilson-Brown, Developer, Researcher
+  Onion services developer, and core member of Tor
+  development team. Researches Tor network measurement and onion
+  service scalability.
 
   Philipp Winter, Researcher
   Understands how to manipulate and circumvent Tor network



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

[tor-commits] [webwml/staging] Add blurbs for Gunner and dawuud

[sebastian]

commit 0e7e1ab1ee03c0f668395c6b7a1bbfb22be99c95
Author: Sebastian Hahn 
Date:   Sun Jun 26 12:51:54 2016 +0200

Add blurbs for Gunner and dawuud
---
 about/en/corepeople.wml | 11 +++
 1 file changed, 11 insertions(+)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index e7d2c0b..c55be8b 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -129,6 +129,11 @@
   Onion services developer, core member of Tor development
   team, and lead developer of Torsocks 2.0.
 
+  Allen Gunn, Tor Community Meetings
+  Gunner co-organizes and helps lead the https://trac.torproject.org/projects/tor/wiki/org/meetings";>Tor
+  Dev Meetings, and advises on Tor community matters.
+
   Marie Gutbub, Advocate
   Helps educate the world about the value of Tor, especially
   in Europe.
@@ -319,6 +324,12 @@
   Part of the Tor Browser team — develops
   and maintains Tor Launcher and Torbutton.
 
+  David Stainton, Developer
+  David contributes code to txttorcon (onion service
+  endpoint), authored roflcopter (tor control port filter
+  daemon) and HoneyBadger (TCP injection attack detector). He
+  also analyzes the Tor network for attacks.
+
   Shari Steele, Executive Director
   Shari comes to the Tor Project with more than 22 years
   of experience fighting for Internet freedom at the



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

[tor-commits] [webwml/staging] Add Tom Ritter to core people

[sebastian]

commit 39d2a9c837a8f601b3247ba9f537bd12fc3ab9df
Author: Sebastian Hahn 
Date:   Thu Jun 23 03:25:53 2016 +0200

Add Tom Ritter to core people
---
 about/en/corepeople.wml | 5 +
 1 file changed, 5 insertions(+)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 5413c03..2e13483 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -293,6 +293,11 @@
   Does trainings and outreach. Runs one of the directory
   authorities.
 
+  Tom Ritter, Developer
+  Maintains https://consensus-health.torproject.org/";>Consensus
+  Health and runs one of the bandwidth authorities.
+
   Leif Ryge, Developer
   Works on security analysis, designer of "bananaphone"
   transport, and part of the pluggable transports team.



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

[tor-commits] [webwml/staging] Remove the ooni job posting

[sebastian]

commit 1c0d0841571d71bb1d4eeb3226ad4efaadda2f73
Author: Sebastian Hahn 
Date:   Tue Jun 21 13:20:03 2016 +0200

Remove the ooni job posting
---
 about/en/jobs-ooni.wml | 151 -
 about/en/jobs.wml  |  22 +++
 2 files changed, 11 insertions(+), 162 deletions(-)

diff --git a/about/en/jobs-ooni.wml b/about/en/jobs-ooni.wml
deleted file mode 100644
index cb52c24..000
--- a/about/en/jobs-ooni.wml
+++ /dev/null
@@ -1,151 +0,0 @@
-## translation metadata
-# Revision: $Revision$
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor Project: Jobs (core developer)" CHARSET="UTF-8"
-
-   
-Home » 
-About » 
-Jobs
-  
-   
-The Tor Project is looking for another dedicated core developer to
-work on OONI!
-
-
-Your job will be to work as a software engineer on the Open Observatory
-of Network Interference (OONI), a global network measurement platform.
-Your initial focus will be on the design and implementation of a
-mechanism for instrumenting probes on which measurements should be run
-and re-engineering the data processing pipeline to scale to the growing
-OONI user-base.
-
-Moreover you will be expected to be working on improving the existing
-measurement instrument (ooni-probe) and the data collection backend
-component (ooni-backend).
-
-
-
-This dedicated contractor position starts as soon as possible for
-a duration of 12 months (or more, depending on further funding and
-progression of the project).
-
-
-Deadline for submissions: 20th of June 2016
-
-
-Any candidate must:
-
-
-
-   Have extensive experience in python and several other
-programming languages.
-   Be comfortable working remotely.
-Be self-directed.
-   Be comfortable and experienced in getting code and design
-reviewed and reviewing the code and design of others.
-   Be comfortable and experienced in documenting and designing
-protocols.
-   Be comfortable with transparency: as a non-profit, everything
-   we do is in public, including your name (or company name) and
-   pay rate.
-
-
-
-An ideal candidate would also:
-
-
-
-Have prior experience with designing and implementing scalable
-complex network applications.
-Not be afraid of refactoring code and writing unit-tests.
-Be familiar with the challenges of developing and scaling data
-processing pipelines.
-Have prior experience working with the
-https://twistedmatrix.com";>Twisted python networking
-framework.
-Be familiar with the network measurement field.
-Have experience with open-source software development, including
-working with distributed teams across different time-zones
-containing employees and volunteers of differing skill levels.
-Have basic familiarity with distributed version control
-systems.
-Have contributed significant chunks of code to multiple
-open-source projects in the past.
-Be passionate about internet freedom and interested in
-contributing to it in a concrete way.
-
-
-
-Other notes:
-
-
-
-You'll need to be comfortable in this environment! We coordinate
-via IRC, instant messaging, email, and bug trackers.
-Academic degrees are great, but not required if you have the
-right experience.
-We only write free and open source software, and we don't
-believe in software patents.
-Compensation will be determined based on experience and can be
-in the range of $6500-$7500 per month.
-
-
-
-How to apply
-
-
-
-Link to a sample of code you've written in the past that you're
-allowed to show us and ideally also your github profile.
-Provide a CV explaining your background, experience, skills, and
-other relevant qualifications.
-List some people who can tell us more about you: these
-references could be employers or co-workers, open source projects,
-etc.
-Email the above to oonidev...@torproject.org
-
-
-
-About the project:
-
-
-
-The Open Observatory of Network Interference (OONI) is a free software
-project under the Tor Project which collects and processes network
-measurements with the aim of detecting network interferences, such as
-censorship, surveillance and traffic manipulation. Since late 2012, OONI
-has collected millions of measurements across more than 90 countries
-around the world.
-
-
-
-About the company:
-
-
-
-The Tor Project is a US 501(c)(3) non-profit dedicated to research,
-development, and education about online anonymity and privacy. The Tor
-network's 6000 volunteer relays carry 48 Gbps for several million daily
-users, including ordinary citizens who want protection from identity
-theft and prying corporations, corporations who want to look at a
-competitor's website in private, people around the world whose Internet
-connections are censored, and even governments and law enforcement. Tor
-has a staff

[tor-commits] [webwml/staging] Updates links on the volunteering page related to Tor sub-projects

[sebastian]

commit a990a7f7ed4d4c1692bd5ed05fc3619ca7069e80
Author: Iain R. Learmonth 
Date:   Wed Jun 8 21:19:06 2016 +0100

Updates links on the volunteering page related to Tor sub-projects

 * Some URLs had (or were missing) trailing slashes which resulted in
   redirects.
 * All of the "bug tracker" links to the Tor trac were using old
   component names and have been updated.
 * The domain previously hosting the Incognito project website appears
   to have been taken over by a domain squatter, the link has been
   replaced with an archive.org link.
 * The homepage for Shadow is now hosted on GitHub, the umn.edu site has
   a redirect in place currently.
 * The ExperimenTor website is now available using HTTPS.
 * The txtorcon documentation is hosted on readthedocs which now uses a
   .io domain for the hosted documentation instead of the .org.
 * OONI now uses GitHub for code hosting and issue tracking.
 * The panopticlick PDF file on the EFF website has changed URL (the old
   URL producing a 404).
---
 getinvolved/en/volunteer.wml | 54 ++--
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index aaf8259..8aa3707 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -64,8 +64,8 @@ meetings around the world.
 or how to use it.  Some have already started on https://media.torproject.org/video/";>Tor's Media server,
 http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy";>Howcast,
-and http://www.youtube.com/thetorproject";>YouTube.
+
href="http://www.howcast.com/videos/90601-How-To-Circumvent-an-Internet-Proxy/";>Howcast,
+and http://www.youtube.com/c/thetorproject";>YouTube.
 Create a poster around a theme, such as "Tor for Freedom!"
 Create a t-shirt design that incorporates "https://check.torproject.org/";>Congratulations! You are using
@@ -401,7 +401,7 @@ meetings around the world.
 
 Tor Browser (https://gitweb.torproject.org/tor-browser.git";>code, https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Torbutton&component=Tor+Launcher&component=Tor+Browser&component=Tor+bundles%2Finstallation&col=id&col=summary&col=status&col=owner&col=type&col=priority&col=milestone&order=priority";>bug
+
href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Applications%2FTor+Browser&component=Applications%2FTorbutton&component=Applications%2FTor+Launcher&component=Applications%2FTor+bundles%2Finstallation&col=id&col=summary&col=status&col=owner&col=type&col=priority&col=milestone&order=priority";>bug
 tracker, https://www.torproject.org/projects/torbrowser/design/";>design 
doc)
 
 
@@ -433,7 +433,7 @@ meetings around the world.
 
 https://www.atagar.com/arm/";>Nyx (https://gitweb.torproject.org/nyx.git";>code, https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=arm&order=priority";>bug
+
href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Core+Tor%2FNyx&order=priority";>bug
 tracker)
 
 
@@ -452,7 +452,7 @@ meetings around the world.
 
 https://guardianproject.info/apps/orbot/";>Orbot (https://gitweb.torproject.org/orbot.git";>code, https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Orbot&order=priority";>bug
+
href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Applications%2FOrbot&order=priority";>bug
 tracker)
 
 
@@ -465,15 +465,15 @@ meetings around the world.
 https://tails.boum.org/";>The Amnesic Incognito Live 
System (https://git-tails.immerda.ch/tails/";>code, https://labs.riseup.net/code/projects/tails";>bug
-tracker, https://tails.boum.org/doc";>documentation, , https://tails.boum.org/doc/";>documentation, https://tails.boum.org/contribute/design/";>design, https://tails.boum.org/contribute";>contribute)
+href="https://tails.boum.org/contribute/";>contribute)
 
 
 The Amnesic Incognito Live System is a live CD/USB distribution
 preconfigured so that everything is safely routed through Tor and leaves no
 trace on the local system. This is a merger of the Amnesia and http://www.anonymityanywhere.com/incognito/";>Incognito projects,
+
href="https://web.archive.org/web/20080512054152/http://anonymityanywhere.com/incognito/";>Incognito
 projects,
 and still under very active development.
 
 
@@ -490,7 +490,7 @@ meetings around the world.
 
 Torsocks 

[tor-commits] [webwml/staging] Enable date detection for rule41 banner

[sebastian]

commit 11e5a7d631f3c1c593f6f12c1e4cf706cde5d816
Author: Sebastian Hahn 
Date:   Mon Jun 20 09:13:51 2016 +0200

Enable date detection for rule41 banner
---
 include/head.wmi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/head.wmi b/include/head.wmi
index 0341ede..7dd267a 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -42,9 +42,7 @@

[tor-commits] [webwml/staging] Add original widget.js and widget.min.js sources

[sebastian]

commit c85ec84cb843db158c846f3d52cddffa8104b366
Author: Sebastian Hahn 
Date:   Tue Jun 21 01:53:30 2016 +0200

Add original widget.js and widget.min.js sources
---
 rule-41/widget.js.orig | 381 +
 rule-41/widget.min.js-orig |  42 +
 2 files changed, 423 insertions(+)

diff --git a/rule-41/widget.js.orig b/rule-41/widget.js.orig
new file mode 100644
index 000..4d6f7f6
--- /dev/null
+++ b/rule-41/widget.js.orig
@@ -0,0 +1,381 @@
+/*
+
+ __   __   __ 
+|  | |  | |  |
+| |__| |__| |__   
+|  __|   |  __|   |  __|  
+| |  | |  | | 
+|__| |_|  |_| 
+  
+  =
+
+  Support the NoGlobalWarrants.org campaign by installing this banner on your 
site.
+
+   for support
+
+  =
+
+  @source: https://github.com/EFForg/ngw-banner
+
+  @licstart  The following is the entire license notice for the
+ JavaScript code in this page.
+
+  Copyright (C) 2016 Electronic Frontier Foundation <https://eff.org>
+
+  The JavaScript code in this page is free software: you can
+  redistribute it and/or modify it under the terms of the GNU
+  General Public License (GNU GPL) as published by the Free Software
+  Foundation, either version 3 of the License, or (at your option) any
+  later version.  The code is distributed WITHOUT ANY WARRANTY;
+  without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+  A PARTICULAR PURPOSE.  See the GNU GPL for more details.
+
+  As additional permission under GNU GPL version 3 section 7, you may
+  distribute non-source (e.g., minimized or compacted) forms of that
+  code without the copy of the GNU GPL normally required by section
+  4, provided you include this license notice and a URL through which
+  recipients can access the Corresponding Source.
+
+ @licend  The above is the entire license notice for the JavaScript
+  code in this page.
+
+*/
+
+// Wrap widget in function to protect scope
+var _banner_config = (typeof banner_config  !== 'undefined') ? banner_config  
: {};
+
+(function (window, widgetConfig) {
+
+  // Do configuration
+  widgetConfig.show_style = widgetConfig.show_style || 'banner';
+  widgetConfig.debug = widgetConfig.debug || false;
+  widgetConfig.localAssets = widgetConfig.localAssets || false;
+  widgetConfig.callOnly = widgetConfig.callOnly || false;
+  widgetConfig.startAsMinimized = widgetConfig.startAsMinimized || false;
+  widgetConfig.disableDate = widgetConfig.disableDate || false;
+  widgetConfig.campaign = widgetConfig.campaign || 'noglobalwarrants';
+  widgetConfig.cookieTimeout = widgetConfig.cookieTimeout || null;
+
+  function debug() {
+if (widgetConfig.debug) {
+  if (this.console) {
+console.log.apply(console, arguments);
+  }
+}
+  }
+
+  // Setup
+  var activeCampaign;
+  var ASSET_URL;
+
+  if (widgetConfig.localAssets) {
+ASSET_URL = '../banner_content/';
+  } else {
+ASSET_URL = 'https://www.eff.org/ngw/banner_content/';
+  }
+
+  // Cookie helpers, taken from w3schools
+  function setCookie(c_name, value, seconds) {
+var exdate = new Date(new Date().getTime() + seconds * 1000);
+var c_value = escape(value) + ((seconds === null) ? '' : '; expires=' +
+  exdate.toUTCString());
+document.cookie = c_name + '=' + c_value;
+  }
+
+  function getCookie(c_name) {
+var c_value = document.cookie;
+var c_start = c_value.indexOf(' ' + c_name + '=');
+
+if (c_start === -1) {
+  c_start = c_value.indexOf(c_name + '=');
+}
+
+if (c_start === -1) {
+  c_value = null;
+} else {
+  c_start = c_value.indexOf('=', c_start) + 1;
+  var c_end = c_value.indexOf(';', c_start);
+  if (c_end === -1) { c_end = c_value.length; }
+  c_value = unescape(c_value.substring(c_start, c_end));
+}
+
+return c_value;
+  }
+
+  // Define checks
+  var checks = {
+correctDate: function (callback) {
+  debug('correctDate()');
+
+  // This used to check the date by getting it from a server, but now just 
uses the device's local date.
+
+  window.dateCallBackFailSafe = setTimeout(function () {
+var today = new Date();
+if (today.getDate() === activeCampaign.runDate.day && today.getMonth() 
=== activeCampaign.runDate.month - 1 && today.getFullYear() === 
activeCampaign.runDate.year) {
+  callback({activeToday: true});
+} else {
+  callback({activeToday: false});
+}
+  }, 1);
+}
+  };
+
+  // Define campaigns
+  var campaign = {
+noglobalwarrants: {
+  cookieName: 'noglobalwarrants_hasseen',
+

[tor-commits] [webwml/master] Revert "Implement rewrite rules for donation campaign"

[sebastian]

commit 4decfd830cfa3d9e47934915ece80d5e7cb573fd
Author: Sebastian Hahn 
Date:   Fri Nov 18 13:59:37 2016 +0100

Revert "Implement rewrite rules for donation campaign"

This reverts commit 10b8d933481f2820e7d6a3bca41d5dba441c9932.
---
 .htaccess | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/.htaccess b/.htaccess
index d5645ea..407b61f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -95,22 +95,3 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
 # yuck, https://twitter.com/torproject/status/677928074630049793
 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
 
-RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org 
[R=302,L]
-RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org 
[R=302,L]
-RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
-RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
- [R=302,L]

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

[tor-commits] [webwml/master] Merge remote-tracking branch 'arthuredelstein/20677+1'

[sebastian]

commit c3058b9a3877378de54434c6a403443cc2620290
Merge: ad07153 41c2777
Author: Sebastian Hahn 
Date:   Fri Nov 18 13:50:47 2016 +0100

Merge remote-tracking branch 'arthuredelstein/20677+1'

 css/donate-style.css   |   1 -
 donate/en/donate-options.wml   |  79 +
 images/2016-tor-logo-heart.png | Bin 0 -> 35104 bytes
 include/donatehead.wmi |   2 +-
 4 files changed, 18 insertions(+), 64 deletions(-)



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

[tor-commits] [webwml/master] Bug 20677: Update alternative payments page

[sebastian]

commit 41c277708b1ff60d9c52cb784ac5a560f31d5e78
Author: Arthur Edelstein 
Date:   Thu Nov 17 18:11:13 2016 -0500

Bug 20677: Update alternative payments page

Also, adds a new donation logo that matches the brand
at donate.torproject.org
---
 css/donate-style.css   |   1 -
 donate/en/donate-options.wml   |  79 +
 images/2016-tor-logo-heart.png | Bin 0 -> 35104 bytes
 include/donatehead.wmi |   2 +-
 4 files changed, 18 insertions(+), 64 deletions(-)

diff --git a/css/donate-style.css b/css/donate-style.css
index bc17e98..55cae54 100644
--- a/css/donate-style.css
+++ b/css/donate-style.css
@@ -220,7 +220,6 @@ blockquote footer{
 }
 footer.footer{
margin-top: 20px;
-   position: absolute;
 bottom: 0;
 width: 100%;
 /* Set the height of the footer here */
diff --git a/donate/en/donate-options.wml b/donate/en/donate-options.wml
index 57e0806..6596d87 100644
--- a/donate/en/donate-options.wml
+++ b/donate/en/donate-options.wml
@@ -5,46 +5,20 @@
 #include "donatehead.wmi" TITLE="Tor Project: Donate to Tor" CHARSET="UTF-8"
 
 
-.hlist {
-padding: 0px;
-text-align: center;
-display: block;
-width: 100%;
-list-style: outside none none;
-margin: 0px 0px 18px;
-}
-
-.hlist li {
-display: inline-block;
-border-right: 1px solid #444;
-margin-left: -4px;
-}
-.hlist a {
-display: block;
-top: 0px;
-right: 0px;
-bottom: 0px;
-left: 0px;
-text-decoration: none;
-font-weight: bold;
-padding: 0px 8px;
-}
-
-.hlist li.last {
-border-right: 0px solid #444;
+form#makeDonation {
+max-width: 500px;
 }
 
 
 
 
-  Ways to Donate to Tor
-  The Tor Project offers the following donation methods:
+  More Ways to Donate to Tor
+  Note: if you wish to donate to The Tor Project by credit card or PayPal, please click here.
+  The Tor Project also offers the following alternative donation methods 
(If you would like to receive a Thank-You Gift after making a donation with one 
of the methods below, please email giv...@torproject.org.):
   
-Bitcoins
+Bitcoin
 Amazon Payments
 https://smile.amazon.com/ch/20-8096820";>Amazon Smile
-https://www.dwolla.com/hub/thetorproject";>Dwolla
-Paypal
 EU Bank Transfer
 Checks or Money Orders
   
@@ -54,14 +28,8 @@


 
-Bitcoins
-In order to comply with US 501(c)(3) non-profit regulations, our 
Bitcoin transaction limit is currently $10,000 USD per day.
-If you wish to avoid transaction limits, please consider a direct Bitcoin 
donation to
-https://www.torservers.net/donate.html#cryptocurrencies";>Torservers.net,
-http://noisetor.net/#bitcoin";>NoiseTor,
-https://www.oniontip.com/";>OnionTip,
-or https://tails.boum.org/contribute/how/donate/#bitcoin";>Tails.
-  If this transaction limit is not an issue for you, please complete the 
form below:
+Donate Bitcoin
+To donate Bitcoin to The Tor Project, please complete the form below. If 
you would like an acknowledgment from the Tor Project, please provide your 
email address.
   https://bitpay.com/checkout"; method="post" 
onsubmit="return bp.validateMobileCheckoutForm($('#makeDonation'));">
 
 
@@ -75,8 +43,8 @@
 
   Amount:
   
-
-
+
+
   USD
   BTC
   EUR
@@ -130,29 +98,18 @@

 
   Donate via Amazon
-  Amazon Payments allows you to donate to Tor via several different
-mechanisms using an Amazon account.
+  You can donate to Tor through your Amazon account.
   Donate via Amazon Payments
 »
 
 
   Donate via Amazon Smile
-  Amazon Smile allows you to donate 0.5% of your Amazon purchases to 
the Tor Project.
-  https://smile.amazon.com/ch/20-8096820";>Donate with Amazon Smile
+  AmazonSmile is a website operated by Amazon with the same products, 
prices, and shopping features as Amazon.com. The difference is that when you 
shop on AmazonSmile, the AmazonSmile Foundation will donate 0.5% of the 
purchase price of eligible products to the charitable organization of your 
choice.
+  https://smile.amazon.com/ch/20-8096820";>Set up the Tor Project on Amazon 
Smile
 »
 
 
-
-
-
-  Donate via Dwolla
-  Dwolla is a peer to peer payment platform which allows users to
-exchange money quickly, safely, at a lower cost.
-  https://www.dwolla.com/hub/thetorproject";>Donate via Dwolla
-»
-
-
 
 
 
@@ -160,9 +117,7 @@ exchange money quickly, safely, at a lower cost.
For European bank transfers, we have an arrangement with
 the Renewable Freedom Foundation to provide
 http://www.solicitorsjournal.com/news/private-client/charities/gifts-foreign-charities-are-tax-deductible-ecj-rules";>tax-deductible
-donations for Europeans. (They don't actually pass the money
- 

[tor-commits] [webwml/master] Implement rewrite rules for donation campaign

[sebastian]

commit 10b8d933481f2820e7d6a3bca41d5dba441c9932
Author: Sebastian Hahn 
Date:   Fri Nov 18 13:55:41 2016 +0100

Implement rewrite rules for donation campaign
---
 .htaccess | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/.htaccess b/.htaccess
index 407b61f..d5645ea 100644
--- a/.htaccess
+++ b/.htaccess
@@ -95,3 +95,22 @@ RewriteRule ^donate/donate-hp(.*) /donate/donate$1 [R=302,L]
 # yuck, https://twitter.com/torproject/status/677928074630049793
 RewriteRule ^Donate/Donate-Twitter(.*) /donate/donate$1 [R=302,L]
 
+RewriteRule ^donate/donate-homepage-en(.*) https://donate.torproject.org 
[R=302,L]
+RewriteRule ^donate/donate-twitter-en(.*) https://donate.torproject.org 
[R=302,L]
+RewriteRule ^donate/donate-share-en(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-fb-en(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-blog-en(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-email-en(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-de(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-en(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-es(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-fa(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-fr(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-it(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-nl(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-pt(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-ru(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-tr(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-vi(.*) https://donate.torproject.org [R=302,L]
+RewriteRule ^donate/donate-tbb-zh(.*) https://donate.torproject.org [R=302,L]
+ [R=302,L]

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

[tor-commits] [webwml/master] Remote grants officer job posting

[sebastian]

commit 8a2844031e44c78d9b049469b5e75b4477523fb7
Author: Sebastian Hahn 
Date:   Wed Nov 16 19:21:04 2016 +0100

Remote grants officer job posting
---
 about/en/jobs-grants-officer.wml | 127 ---
 about/en/jobs.wml|   1 -
 2 files changed, 128 deletions(-)

diff --git a/about/en/jobs-grants-officer.wml b/about/en/jobs-grants-officer.wml
deleted file mode 100644
index eb93b0b..000
--- a/about/en/jobs-grants-officer.wml
+++ /dev/null
@@ -1,127 +0,0 @@
-## translation metadata
-# Revision: $Revision: 25666 $
-# Translation-Priority: 3-low
-
-#include "head.wmi" TITLE="Tor Project: Jobs (Controller)" CHARSET="UTF-8"
-
-   
-Home » 
-About » 
-Jobs
-  
-   
-Internet Freedom Nonprofit Seeks Experienced Chief Financial and Grants 
Officer
-(Posted August 29, 2016)
-
-The Tor Project, Inc., is a 501(c)(3) organization headquartered in
-Seattle that provides the technical infrastructure for privacy
-protection over the Internet. With paid staff and contractors of around
-25 technologists and operational support people, plus many volunteers
-all over the world who contribute to our work, the Tor Project is funded
-in part by government grants and contracts, as well as by individual,
-foundation, and corporate donations. Our mission statement: “To advance
-human rights and freedoms by creating and deploying free and open
-anonymity and privacy technologies, supporting their unrestricted
-availability and use, and furthering their scientific and popular
-understanding.”
-We are currently seeking an Experienced Chief Financial and Grants
-Officer. This new, senior level position will report directly to the
-Executive Director and will manage the offsite Accounting Manager.
-
-The Chief Financial and
-Grants Officer will serve as the Tor Project's senior grants officer.
-Grant-related tasks include, but are not limited to:
-
-
-Oversee grants and contracts to ensure compliance with funder
-requirements and progress toward annual goals.
-Maintain positive relationships & communications with applicable
-government agencies.
-reate an interactive database of all grants and contracts in
-order to monitor and track them.
-Manage invoicing and billing of federal contracts to ensure full
-payment is received.
-Communicate the status of grant activities and progress toward
-objectives to stakeholders.
-Maintain files and documentation for our federal grants and
-contracts to ensure accuracy and compliance.
-
-
-In addition, the Chief
-Financial and Grants Officer will serve as the Tor Project's senior
-finance officer. Finance-related tasks for this position include, but
-are not limited to:
-
-
-Maintain accounting controls by preparing and recommending
-policies and procedures; review and upgrade as needed to ensure accuracy
-in accounting activities and compliance with any regulatory
-changes.
-Monitor and project cash flow.
-Provide oversight to ensure accounts payable and receivables are
-coded and prepared correctly.
-Work with outside auditors and CPA firm to furnish requisite data
-to ensure timely completion of annual audits and tax filings.
-Work closely with the Executive Director to prepare budgets and
-financial reports.
-Track expenditures and income of various programs to ensure
-financial sustainability.
-
- The person we seek
-should have the following qualities, skills, and abilities:
-
-5+ years of experience with federal grants and contract
-acquisition and management
-5+ years of experience overseeing a nonprofit organization's
-accounting function; other relevant experience may substitute for a
-portion of this required experience
-Bachelor’s degree in business, finance, accounting, or a closely
-related field is ideal but not required; advanced graduate degree in one
-of the above fields is preferred; CPA license a plus
-Working knowledge of not-for-profit accounting in accordance with
-U.S. Generally Accepted Accounting Principles, Subpart F, of the new
-Uniform Grant Guidance (formerly OMB Circular A-133) and appropriate
-Code of Federal Regulations
-Knowledge of the grants management software landscape, and
-advanced skill and experience with at least one grants management
-software package
-Advanced skill and experience using QuickBooks, Sage (Peachtree),
-or some other organizational accounting program
-Alignment with Tor Project’s mission and a passion for privacy
-and encryption technology preferred
-Experience with FOSS (free/open-source software) preferred
-Proficient understanding of and ability to use technology;
-willingness and ability to learn and use new technologies
-Hard working and highly organized with superior attention to
-detail
-
-The Tor Project's workforce is smart, passionate, and dedicated.
-Experience working with open source communities and/or a commitment to
-Internet civil liberties are added pluses for any candidate applying for
-this

[tor-commits] [webwml/master] Bug 20465: Call it 'Tor Browser', not 'The Tor Browser'

[sebastian]

commit 5bd3add63c57f92dfa36653f8b4e01a948c01981
Author: Arthur Edelstein 
Date:   Tue Oct 25 16:33:02 2016 -0400

Bug 20465: Call it 'Tor Browser', not 'The Tor Browser'
---
 about/en/corepeople.wml  |  2 +-
 docs/en/faq.wml  | 16 
 docs/en/tor-doc-osx.wml  |  4 ++--
 docs/en/verifying-signatures.wml |  6 +++---
 donate/en/donor-faq.wml  |  2 +-
 download/en/download-easy.wml| 12 ++--
 download/en/download.wml | 12 ++--
 include/head.wmi |  2 +-
 projects/en/projects.wml |  2 +-
 projects/en/torbrowser.wml   | 12 ++--
 10 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 9ece58b..7df9e2a 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -255,7 +255,7 @@
   Researcher at University College London who works
   on security, performance, and usability of Tor. Original creator
   of the Tor Browser
-  Bundle (now just called the Tor Browser). You can find
+  Bundle (now just called Tor Browser). You can find
   out more about his work on his
   http://www.cs.ucl.ac.uk/staff/s.murdoch/";>professional
   website.
diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index 301b6a4..5f89bcc 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -873,8 +873,8 @@ executive
 
 No, it doesn't. You need to use a separate program that understands
 your application and protocol and knows how to clean or "scrub" the data
-it sends. The Tor Browser tries to keep application-level data,
-like the user-agent string, uniform for all users. The Tor Browser can't
+it sends. Tor Browser tries to keep application-level data,
+like the user-agent string, uniform for all users. Tor Browser can't
 do anything about text that you type into forms, though. Be
 careful and be smart.
@@ -1060,7 +1060,7 @@ from the graphical interface. Open "Files" (Unity's 
explorer), open
 Preferences-> Behavior Tab -> Set "Run executable text files when they are
 opened" to "Ask every time", then OK.
 
-You can also start the Tor Browser from the command line by running 
+You can also start Tor Browser from the command line by running 
 ./start-tor-browser
 
 from inside the Tor Browser directory.
@@ -1104,7 +1104,7 @@ issue.
 Firefox extensions?
 
 
-The Tor Browser is free software, so there is nothing preventing you from
+Tor Browser is free software, so there is nothing preventing you from
 modifying it any way you like. However, we do not recommend installing any
 additional Firefox add-ons with Tor Browser. Add-ons can break
 your anonymity in a number of ways, including browser fingerprinting and
@@ -1112,7 +1112,7 @@ bypassing proxy settings.
 
 
 Some people have suggested we include ad-blocking software or
-anti-tracking software with the Tor Browser. Right now, we do not
+anti-tracking software with Tor Browser. Right now, we do not
 think that's such a good idea. Tor Browser aims to provide
 sufficient privacy that additional add-ons to stop ads and trackers are
 not necessary. Using add-ons like these may cause some sites to break, which
@@ -1185,7 +1185,7 @@ really bad idea.
 Our efforts to work with the Chrome team to https://blog.torproject.org/blog/google-chrome-incognito-mode-tor-and-fingerprinting";>add
 missing APIs were unsuccessful, unfortunately. Currently, it is impossible
-to use other browsers and get the same level of protections as when using the
+to use other browsers and get the same level of protections as when using
 Tor Browser.
 
 
@@ -3375,9 +3375,9 @@ diversity,
 a web browser that is preconfigured to
 help you control the risks to your privacy and anonymity while browsing
 the Internet. Not only are the above technologies disabled to prevent
-identity leaks, the Tor Browser also includes browser extensions like
+identity leaks, Tor Browser also includes browser extensions like
 NoScript and Torbutton, as well as patches to the Firefox source
-code. The full design of the Tor Browser can be read https://www.torproject.org/projects/torbrowser/design/";>here.
 In designing a safe, secure solution for browsing the web with Tor,
 we've discovered that configuring other
diff --git a/docs/en/tor-doc-osx.wml b/docs/en/tor-doc-osx.wml
index 6840b4b..454efa9 100644
--- a/docs/en/tor-doc-osx.wml
+++ b/docs/en/tor-doc-osx.wml
@@ -19,8 +19,8 @@
 are done.
 
 
-Even 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
+Even though Tor Browser comes with a regular Tor, it will only run
+as long as you keep 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 tr

[tor-commits] [webwml/master] Add title and link from main jobs page

[sebastian]

commit ae4588b8e9efdda601ce66349cfb651115a1f04e
Author: Arturo Filastò 
Date:   Thu Oct 13 16:40:53 2016 +0200

Add title and link from main jobs page
---
 about/en/jobs-ooni-ux-designer.wml | 2 ++
 about/en/jobs.wml  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/about/en/jobs-ooni-ux-designer.wml 
b/about/en/jobs-ooni-ux-designer.wml
index 07eb862..28e9733 100644
--- a/about/en/jobs-ooni-ux-designer.wml
+++ b/about/en/jobs-ooni-ux-designer.wml
@@ -10,6 +10,8 @@
 Jobs
   
   
+  UX Designer - OONI
+  (Posted October 13, 2016)
 
 The https://ooni.torproject.org";>Open Observatory
 of Network Interference (OONI), a project under The Tor
diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 76330a9..29c2a94 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -20,6 +20,7 @@
 
 
 Chief Financial and Grants 
Officer
+UX Designer - OONI
 #Writer/Editor
 #Administrative 
Assistant
 

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

[tor-commits] [webwml/master] Add job posting for OONI UX Designer

[sebastian]

commit 10e7d22c72c3e5aa21b9e1466617889dd1579de9
Author: Arturo Filastò 
Date:   Thu Oct 13 16:25:00 2016 +0200

Add job posting for OONI UX Designer
---
 about/en/jobs-ooni-ux-designer.wml | 103 +
 1 file changed, 103 insertions(+)

diff --git a/about/en/jobs-ooni-ux-designer.wml 
b/about/en/jobs-ooni-ux-designer.wml
new file mode 100644
index 000..07eb862
--- /dev/null
+++ b/about/en/jobs-ooni-ux-designer.wml
@@ -0,0 +1,103 @@
+## translation metadata
+# Revision: $Revision$
+# Translation-Priority: 3-low
+
+#include "head.wmi" TITLE="Tor Project: Jobs (OONI UX Designer)" 
CHARSET="UTF-8"
+
+  
+Home » 
+About » 
+Jobs
+  
+  
+
+The https://ooni.torproject.org";>Open Observatory
+of Network Interference (OONI), a project under The Tor
+Project that aims to uncover internet censorship by monitoring
+its prevalence around the world, is seeking a UX designer to
+improve the UI of its desktop (web based) and mobile
+client.
+
+We are looking for someone that can:
+
+
+
+Review the overall UX flow and provide suggestions for improvements to
+the application flow.
+
+
+Provide suggestions for improvements to the layout of the
+mobile and desktop client. 
+
+Construct design assets and make the visual style of the
+desktop and mobile client more coherent. 
+
+
+
+
+
+You can find screenshots of the current views for the current
+desktop client here:
+https://github.com/TheTorProject/ooni-wui/issues/4#issuecomment-252314702";>https://github.com/TheTorProject/ooni-wui/issues/4#issuecomment-252314702
+
+
+
+You can find screenshots of the current views for the mobile client here:
+https://github.com/measurement-kit/netprobe-ios/issues/43";>https://github.com/measurement-kit/netprobe-ios/issues/43
+
+
+
+This is a contractor position for a fixed bid project. The rate for the
+work will be negotiated and is going to be between 5k-10k USD.
+
+
+
+We are a dynamic team that works from different places around
+the world. Most of our coordination happens via the internet,
+on public issue trackers (github) and more real time
+coordination happens via IRC (irc.oftc.net #ooni). Ideally you
+would be comfortable working with these tools.
+
+
+
+Many of us are based out of Italy (mainly Rome), so we
+would prefer somebody that is located closest, but this
+is not a strict requirement.
+
+
+
+If this project interests you, please reach out to us and we can discuss 
it in
+more detail. We know that other projects related to OONI are hoping to hire
+designers in the near term, so we would love it if this
+https://www.youtube.com/watch?v= 5kiNJcDG4E0">could
+be the beginning of a beautiful friendship.
+
+
+When applying for this position please include:
+
+
+A link to your portfolio containing relevant work
+
+Your Curriculum Vitae
+
+
+
+Our contact information is:
+
+
+email: j...@openobservatory.org
+encrypted email: cont...@openobservatory.org (PGP: 4C15 DDA9 96C6 C0CF 
48BD 3309 6B29 43F0 0CB1 77B7)
+irc: irc.oftc.net #ooni
+
+
+
+  
+  
+  
+#include "side.wmi"
+#include "info.wmi"
+  
+  
+
+
+#include 

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

[tor-commits] [webwml/master] Fix display of ipv6 addresses on the website

[sebastian]

commit 6c84e8022ee16fcb532ebeaa0744d2dea3da379c
Author: Sebastian Hahn 
Date:   Tue Oct 11 17:23:28 2016 +0200

Fix display of ipv6 addresses on the website

I don't know what WML is doing, but somehow it's treating [FE80::] as a
special thing it doesn't want to display (unlike [::], which it displays
just fine). Fixes bug 18667.
---
 docs/en/tor-manual.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/tor-manual.wml b/docs/en/tor-manual.wml
index 3c81813..3d55e65 100644
--- a/docs/en/tor-manual.wml
+++ b/docs/en/tor-manual.wml
@@ -14,7 +14,7 @@
 
 <:
die "Missing git clone at $(TORGIT)" unless -d "$(TORGIT)";
-   my $man = `GIT_DIR=$(TORGIT) git show $(STABLETAG):doc/tor.1.txt | 
asciidoc -d manpage -s -o - -`;
+   my $man = `GIT_DIR=$(TORGIT) git show $(STABLETAG):doc/tor.1.txt | 
asciidoc -d manpage -s -o - - | sed 's/\\[/\\[/g'`;
die "No manpage because of asciidoc error or file not available from 
git" unless $man;
print $man;
 :>

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

[tor-commits] [webwml/master] Add GetTor Twitter account information

[sebastian]

commit 7146b16186b4ca97a93a0b67faef03488958ceed
Author: Sukhbir Singh 
Date:   Mon Sep 26 14:57:59 2016 -0400

Add GetTor Twitter account information
---
 projects/en/gettor.wml | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml
index 4a5d6fd..1cbbf2c 100644
--- a/projects/en/gettor.wml
+++ b/projects/en/gettor.wml
@@ -56,6 +56,12 @@ pluggable transports. These guides will be provided by 
the GetTor
 robot in the future.
 
 
+Download Tor Browser via Twitter
+You can send a direct message to https://twitter.com/get_tor";>@get_tor account (you don't need to
+follow). Send the word help in a direct message to learn how to interact
+with it.
+
   
   
   

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

[tor-commits] [webwml/master] Update rpm instructions

[sebastian]

commit 17282053cdf6401a56f6232d54538fda563938d5
Author: Sebastian Hahn 
Date:   Sat Sep 24 10:28:33 2016 +0200

Update rpm instructions

Thanks cypherpunks for the patch!
---
 docs/en/tor-doc-unix.wml  | 2 --
 download/en/download-unix.wml | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/en/tor-doc-unix.wml b/docs/en/tor-doc-unix.wml
index c35ba8f..c543b53 100644
--- a/docs/en/tor-doc-unix.wml
+++ b/docs/en/tor-doc-unix.wml
@@ -30,8 +30,6 @@
 Red Hat, Gentoo, etc there too. If you're
 using Ubuntu, don't use the default packages: use our deb repository instead.
-Similarly, CentOS / Fedora users should use our rpm repository instead.
 
 
 If you're building from source, first install 
  
 CentOS and Fedora
-repository packages 
+yum install tor / dnf install tor
  Linux/BSD/Unix 
 
 

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

[tor-commits] [webwml/master] Two more blog url fixes

[sebastian]

commit e233c2811c1e6b12e21190013a8fdc51ef40e4ee
Author: Sebastian Hahn 
Date:   Fri Sep 23 06:24:06 2016 +0200

Two more blog url fixes
---
 docs/en/faq-abuse.wml | 2 +-
 docs/en/faq.wml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en/faq-abuse.wml b/docs/en/faq-abuse.wml
index 17b810f..76d3db3 100644
--- a/docs/en/faq-abuse.wml
+++ b/docs/en/faq-abuse.wml
@@ -164,7 +164,7 @@ using technology?
 types, see the collection of templates
 on the Tor wiki. You can also proactively reduce the amount of abuse 
you
-get by following these tips
+get by following these tips
 for running an exit node with minimal harassment and running a reduced exit policy.
 
diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index abf47de..301b6a4 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -2366,7 +2366,7 @@ on
 issues you might
 encounter
 if you use the default exit policy, and then read Mike Perry's
-tips
+tips
 for running an exit node with minimal harassment.
 
 

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

[tor-commits] [webwml/master] Fix broken blog link (thanks dmr)

[sebastian]

commit ff3ba9097697cd6e260697073628d14d2144c2da
Author: Sebastian Hahn 
Date:   Fri Sep 23 06:19:02 2016 +0200

Fix broken blog link (thanks dmr)

*shakes fist angrily at people editing blog titles*
---
 eff/en/tor-legal-faq.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eff/en/tor-legal-faq.wml b/eff/en/tor-legal-faq.wml
index 16ac0af..09d265a 100644
--- a/eff/en/tor-legal-faq.wml
+++ b/eff/en/tor-legal-faq.wml
@@ -107,7 +107,7 @@ you. These relays do not directly forward traffic to the 
Internet and so
 can't be easily mistaken for the origin of allegedly unlawful content.
 
 The Tor Project's blog has some excellent https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment";>recommendations
+href="https://blog.torproject.org/blog/tips-running-exit-node";>recommendations
 for running an exit with as little risk as possible. We suggest that
 you review their advice before setting up an exit relay.
 
@@ -146,7 +146,7 @@ responsible for the content. This could mean the difference 
between
 having your computer seized by law enforcement and being left alone.
 
 The Tor Project https://blog.torproject.org/blog/tips-running-exit-node-minimal-harassment";>suggests
+href="https://blog.torproject.org/blog/tips-running-exit-node";>suggests
 the following ways to let others know that you're running an exit
 relay:
 

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

[tor-commits] [webwml/master] Add new subkeys for Tor Browser's and gk's key

[sebastian]

commit 62c6eea47025b9ead396f01c5a71dde1b76cd039
Author: Georg Koppen 
Date:   Wed Sep 21 12:44:51 2016 +

Add new subkeys for Tor Browser's and gk's key
---
 docs/en/signing-keys.wml |  5 +++--
 docs/en/verifying-signatures.wml | 10 +++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/docs/en/signing-keys.wml b/docs/en/signing-keys.wml
index 06ef0a4..343f266 100644
--- a/docs/en/signing-keys.wml
+++ b/docs/en/signing-keys.wml
@@ -103,8 +103,8 @@
 pub   4096R/4B7C3223 2013-07-30
   Key fingerprint = 35CD 74C2 4A9B 15A1 9E1A  81A1 9437 3AA9 4B7C 3223
 uid  Georg Koppen 
-sub   4096R/24690903 2015-07-20 [expires: 2016-07-19]
-sub   4096R/631602F4 2015-07-20 [expires: 2016-07-19]
+sub   4096R/0x2F7477373D6B000D 2016-08-01 [expires: 2017-09-11]
+sub   4096R/0xAA602CC00C257CF7 2016-08-01 [expires: 2017-09-11]
 
 pub   4096R/D0220E4B 2014-03-19
   Key fingerprint = 4A90 646C 0BAE D9D4 56AB  3111 E5B8 1856 D022 0E4B
@@ -121,6 +121,7 @@
 uid   Tor Browser Developers (signing key) 

 sub   4096R/0x2E1AC68ED40814E0 2014-12-15 [expires: 2017-08-25]
 sub   4096R/0x7017ADCEF65C2036 2014-12-15 [expires: 2017-08-25]
+sub   4096R/0xD1483FA6C3C07136 2016-08-24 [expires: 2018-08-24]
 
 pub   2048R/0x42E86A2A11F48D36 2011-05-11 [expires: 2017-05-09]
   Key fingerprint = B744 17ED DF22 AC9F 9E90  F491 42E8 6A2A 11F4 8D36
diff --git a/docs/en/verifying-signatures.wml b/docs/en/verifying-signatures.wml
index 6d96984..94ad398 100644
--- a/docs/en/verifying-signatures.wml
+++ b/docs/en/verifying-signatures.wml
@@ -80,6 +80,7 @@
 uid  Tor Browser Developers (signing key) 

 sub   4096R/F65C2036 2014-12-15
 sub   4096R/D40814E0 2014-12-15
+sub   4096R/C3C07136 2016-08-24
 
 To verify the signature of the package you downloaded, you will need
 to download the ".asc" file as well. Assuming you downloaded the
@@ -95,7 +96,8 @@
 Currently valid subkey fingerprints are:
 
 5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036
-BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0
+BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0
+A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136
 
 Notice that there is a warning because you haven't assigned a trust
 index to this person. This means that GnuPG verified that the key made
@@ -131,7 +133,8 @@
   Key fingerprint = EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 8290
 uid  Tor Browser Developers (signing key) 

 sub   4096R/F65C2036 2014-12-15
-sub   4096R/D40814E0 2014-12-15
+sub   4096R/D40814E0 2014-12-15
+sub   4096R/C3C07136 2016-08-24
 To verify the signature of the package you downloaded, you will need
 to download the ".asc" file as well. Assuming you downloaded the
 package and its signature to your Downloads folder, run:
@@ -152,7 +155,8 @@
 Primary key fingerprint: EF6E 286D DA85 EA2A 4BA7  DE68 4E2C 6E87 9329 
8290  Currently valid subkey fingerprints are:
 
 5242 013F 02AF C851 B1C7  36B8 7017 ADCE F65C 2036
-BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0
+BA1E E421 BBB4 5263 180E  1FC7 2E1A C68E D408 14E0
+A430 0A6B C93C 0877 A445  1486 D148 3FA6 C3C0 7136
 
 Notice that there is a warning because you haven't assigned a trust
 index to this person. This means that GnuPG verified that the key made

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

[tor-commits] [webstats/master] fix typo, thanks arma

[sebastian]

commit 430308b72c52f3f01c13148249190a9a2d781144
Author: Sebastian Hahn 
Date:   Thu Sep 15 14:36:03 2016 +0200

fix typo, thanks arma
---
 src/sanitize.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sanitize.py b/src/sanitize.py
index 9fae32c..36cd210 100755
--- a/src/sanitize.py
+++ b/src/sanitize.py
@@ -58,7 +58,7 @@ with open(yesterday_fname, 'a') as file_old:
 for line in fileinput.input(sys.argv[1]):
 matched = is_valid_regex.match(line)
 if matched is None:
-#print(line, "Last line does not match critera", 
file=sys.stderr)
+#print(line, "Last line does not match criteria", 
file=sys.stderr)
 continue
 date = dateutil.parser.parse(matched.group(2))
 if today != date and day_before != date:

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

[tor-commits] [webstats/master] Adapt for metrics

[sebastian]

commit 1f4d0c999c4a38c1f8288f1c70f94f0a25bc03a7
Author: Sebastian Hahn 
Date:   Thu Sep 15 13:57:51 2016 +0200

Adapt for metrics
---
 src/sanitize.py | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/sanitize.py b/src/sanitize.py
index d6baf41..9fae32c 100755
--- a/src/sanitize.py
+++ b/src/sanitize.py
@@ -58,7 +58,7 @@ with open(yesterday_fname, 'a') as file_old:
 for line in fileinput.input(sys.argv[1]):
 matched = is_valid_regex.match(line)
 if matched is None:
-print(line, "Last line does not match critera", 
file=sys.stderr)
+#print(line, "Last line does not match critera", 
file=sys.stderr)
 continue
 date = dateutil.parser.parse(matched.group(2))
 if today != date and day_before != date:
@@ -74,9 +74,10 @@ with open(yesterday_fname, 'a') as file_old:
 #print(matched.expand(sanitized_regex), file=sys.stderr, 
end="")
 continue
 
-if matched.group(1) == "0":
+# metrics weblogs don't start lines with 0.0.0.0 :(
+#if matched.group(1) == "0":
 #print(matched.expand(sanitized_regex), file=sys.stderr, 
end="")
-continue
+#continue
 
 if today == date:
 file_new.write(matched.expand(sanitized_regex))

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

[tor-commits] [webwml/master] Tor Mirror update for 9/8/2016 at 0350 AM

[sebastian]

 2015
-hackthissite.org, HackThisSite.org, US, United States, US, TRUE, TRUE, No, 
http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , 
http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , 
Tue Apr 26 23:34:18 2016
-paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, 
FALSE, No, http://torproject.coffswifi.net, , , , 
http://torproject.coffswifi.net/dist, , , , Tue Apr 26 23:34:18 2016
-Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, 
http://tor.cyberarmy.at/, , , , , , , , Wed Jan 13 13:17:09 2016
-hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, 
FALSE, No, http://www.theonionrouter.com/, , , , 
http://www.theonionrouter.com/dist/, , , , Tue Apr 26 23:34:18 2016
-Tor Fan, crazyhaze.de, DE, Germany, DE, TRUE, FALSE, No, 
http://tor.crazyhaze.de/, https://tor.crazyhaze.de/, , , 
http://tor.crazyhaze.de/dist/, https://tor.crazyhaze.de/dist/, , , Tue Jul  7 
15:16:29 2015
-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/, , , , Sat Sep 12 05:14:19 
2015
-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, , Tue Apr 26 23:34:18 
2016
-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/, Tue Apr 26 23:34:18 2016
-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/, , , Tue Apr 26 23:34:18 2016
-Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, 
http://torproject.lightning-bolt.net/, , , , 
http://torproject.lightning-bolt.net/dist/, , , , Mon Mar 16 09:53:03 2015
-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/, , , Tue Apr 26 23:34:18 2016
-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/, , , 
Tue Jan 20 10:17:52 2015
-t...@les.net, t...@les.net, CA, Canada, CA, TRUE, FALSE, NO, 
http://tor.les.net/, , , , http://tor.les.net/dist, , , , Tue Apr 26 23:34:18 
2016
-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 Apr 26 
23:34:18 2016
-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 Apr 26 23:34:18 2016
-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 Apr 26 23:34:18 2016
-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 Jul 15 06:49:12 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 Apr 26 23:34:18 2016
-EFF, EFF, US, United States, US, TRUE, FALSE, NO, , https://tor.eff.org, , , , 
https://tor.eff.org/dist/, , , Tue Apr 26 23:34:18 2016
-Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, http://tor.void.gr, 
https://tor.void.gr, , , http://tor.void.gr/dist/, https://tor.void.gr/dist/, , 
, Tue Apr 26 23:34:18 2016
-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 Apr 26 23:34:18 2016
-jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, 
http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , 
Tue Apr 26 23:34:18 2016
-tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, 
http://tor.miglix.eu, https://tor.miglix.eu, , , ht

[tor-commits] [webwml/master] fix header sizes in job posting

[sebastian]

commit b9b304970d5aba9cb965e41893b0091466a3e256
Author: Sebastian Hahn 
Date:   Wed Aug 31 18:39:21 2016 +0200

fix header sizes in job posting
---
 about/en/jobs-grants-officer.wml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/about/en/jobs-grants-officer.wml b/about/en/jobs-grants-officer.wml
index 3227fa6..eb93b0b 100644
--- a/about/en/jobs-grants-officer.wml
+++ b/about/en/jobs-grants-officer.wml
@@ -28,9 +28,9 @@ understanding.”
 Officer. This new, senior level position will report directly to the
 Executive Director and will manage the offsite Accounting Manager.
 
-The Chief Financial and
+The Chief Financial and
 Grants Officer will serve as the Tor Project's senior grants officer.
-Grant-related tasks include, but are not limited to:
+Grant-related tasks include, but are not limited to:
 
 
 Oversee grants and contracts to ensure compliance with funder

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

[webwml/master] add the grants officer page…

[sebastian]

commit 66eb675a59a22bd79716185e17c06357608c7599
Author: Sebastian Hahn 
Date:   Wed Aug 31 02:36:53 2016 +0200

add the grants officer page…
---
 about/en/jobs-grants-officer.wml | 127 +++
 1 file changed, 127 insertions(+)

diff --git a/about/en/jobs-grants-officer.wml b/about/en/jobs-grants-officer.wml
new file mode 100644
index 000..3227fa6
--- /dev/null
+++ b/about/en/jobs-grants-officer.wml
@@ -0,0 +1,127 @@
+## translation metadata
+# Revision: $Revision: 25666 $
+# Translation-Priority: 3-low
+
+#include "head.wmi" TITLE="Tor Project: Jobs (Controller)" CHARSET="UTF-8"
+
+   
+Home » 
+About » 
+Jobs
+  
+   
+Internet Freedom Nonprofit Seeks Experienced Chief Financial and Grants 
Officer
+(Posted August 29, 2016)
+
+The Tor Project, Inc., is a 501(c)(3) organization headquartered in
+Seattle that provides the technical infrastructure for privacy
+protection over the Internet. With paid staff and contractors of around
+25 technologists and operational support people, plus many volunteers
+all over the world who contribute to our work, the Tor Project is funded
+in part by government grants and contracts, as well as by individual,
+foundation, and corporate donations. Our mission statement: “To advance
+human rights and freedoms by creating and deploying free and open
+anonymity and privacy technologies, supporting their unrestricted
+availability and use, and furthering their scientific and popular
+understanding.”
+We are currently seeking an Experienced Chief Financial and Grants
+Officer. This new, senior level position will report directly to the
+Executive Director and will manage the offsite Accounting Manager.
+
+The Chief Financial and
+Grants Officer will serve as the Tor Project's senior grants officer.
+Grant-related tasks include, but are not limited to:
+
+
+Oversee grants and contracts to ensure compliance with funder
+requirements and progress toward annual goals.
+Maintain positive relationships & communications with applicable
+government agencies.
+reate an interactive database of all grants and contracts in
+order to monitor and track them.
+Manage invoicing and billing of federal contracts to ensure full
+payment is received.
+Communicate the status of grant activities and progress toward
+objectives to stakeholders.
+Maintain files and documentation for our federal grants and
+contracts to ensure accuracy and compliance.
+
+
+In addition, the Chief
+Financial and Grants Officer will serve as the Tor Project's senior
+finance officer. Finance-related tasks for this position include, but
+are not limited to:
+
+
+Maintain accounting controls by preparing and recommending
+policies and procedures; review and upgrade as needed to ensure accuracy
+in accounting activities and compliance with any regulatory
+changes.
+Monitor and project cash flow.
+Provide oversight to ensure accounts payable and receivables are
+coded and prepared correctly.
+Work with outside auditors and CPA firm to furnish requisite data
+to ensure timely completion of annual audits and tax filings.
+Work closely with the Executive Director to prepare budgets and
+financial reports.
+Track expenditures and income of various programs to ensure
+financial sustainability.
+
+ The person we seek
+should have the following qualities, skills, and abilities:
+
+5+ years of experience with federal grants and contract
+acquisition and management
+5+ years of experience overseeing a nonprofit organization's
+accounting function; other relevant experience may substitute for a
+portion of this required experience
+Bachelor’s degree in business, finance, accounting, or a closely
+related field is ideal but not required; advanced graduate degree in one
+of the above fields is preferred; CPA license a plus
+Working knowledge of not-for-profit accounting in accordance with
+U.S. Generally Accepted Accounting Principles, Subpart F, of the new
+Uniform Grant Guidance (formerly OMB Circular A-133) and appropriate
+Code of Federal Regulations
+Knowledge of the grants management software landscape, and
+advanced skill and experience with at least one grants management
+software package
+Advanced skill and experience using QuickBooks, Sage (Peachtree),
+or some other organizational accounting program
+Alignment with Tor Project’s mission and a passion for privacy
+and encryption technology preferred
+Experience with FOSS (free/open-source software) preferred
+Proficient understanding of and ability to use technology;
+willingness and ability to learn and use new technologies
+Hard working and highly organized with superior attention to
+detail
+
+The Tor Project's workforce is smart, passionate, and dedicated.
+Experience working with open source communities and/or a commitment to
+Internet civil liberties are added pluses for any candidate applying for
+this position.
+
+Flexible salary, depending on e

[tor-commits] [webwml/master] Add grants officer job

[sebastian]

commit 85430d7eab73f405d758d8f37d87e80a2b0682dc
Author: Sebastian Hahn 
Date:   Wed Aug 31 02:34:18 2016 +0200

Add grants officer job
---
 about/en/jobs.wml | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 4a585f1..76330a9 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -12,25 +12,25 @@

 The Tor Project is always looking for more great people to join our 
team!
 
-At 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
-volunteers page.
-
-#Specifically, we're looking for the following people currently:
-#
-#
-#Core OONI Developer
-##Writer/Editor
-##Administrative 
Assistant
-#
-#
+#At 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
+#volunteers page.
+#
+Specifically, we're looking for the following people currently:
+
+
+Chief Financial and Grants 
Officer
+#Writer/Editor
+#Administrative 
Assistant
+
+
 
 In the past, we looked for the following people:
 
 
-Core developer
-Support assistants and translators
-Browser hacker
+Core developer
+Support assistants and translators
+Browser hacker
 Pluggable transport developer
 Lead Automation Engineer
 Firefox/Thunderbird Extension Developer

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

[tor-commits] [webwml/master] Update debian packge with 0.2.9-experimental

[sebastian]

commit 3c84d62498f289083b36e229f88e4cdc0c3e9bdb
Author: Sebastian Hahn 
Date:   Tue Aug 23 01:45:06 2016 +0200

Update debian packge with 0.2.9-experimental
---
 docs/en/debian.wml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/debian.wml b/docs/en/debian.wml
index 5f0581d..de91aaa 100644
--- a/docs/en/debian.wml
+++ b/docs/en/debian.wml
@@ -21,7 +21,7 @@ var software = {
  'wily':[ 'wily'],
  'xenial':  [ 'xenial'],
  },
- 'experimental-0.2.8.x': {
+ 'experimental-0.2.9.x': {
  'wheezy':  [ 'wheezy' ],
  'jessie':  [ 'jessie' ],
  'stretch': [ 'stretch' ],
@@ -43,7 +43,7 @@ var software = {
  'wily':[ 'wily'],
  'xenial':  [ 'xenial'],
  },
- 'experimental-0.2.8.x': {
+ 'experimental-0.2.9.x': {
  'wheezy':  [ 'wheezy' ],
  'jessie':  [ 'jessie' ],
  'stretch': [ 'stretch' ],
@@ -365,7 +365,7 @@ download/download>#packagediff">development branch of 
Tor instead
 to your /etc/apt/sources.list file:
 
 deb http://deb.torproject.org/torproject.org <DISTRIBUTION> main
-deb http://deb.torproject.org/torproject.org 
tor-experimental-0.2.6.x-<DISTRIBUTION> main
+deb http://deb.torproject.org/torproject.org 
tor-experimental-0.2.9.x-<DISTRIBUTION> main
 
 where you again substitute the name of your distro (lenny,
 sid, saucy, ...) in place of
@@ -403,7 +403,7 @@ deb-src http://deb.torproject.org/torproject.org 
<DISTRIBUTION> main
 
 # For the unstable version.
 deb-src http://deb.torproject.org/torproject.org <DISTRIBUTION> main
-deb-src http://deb.torproject.org/torproject.org 
tor-experimental-0.2.6.x-<DISTRIBUTION> main
+deb-src http://deb.torproject.org/torproject.org 
tor-experimental-0.2.9.x-<DISTRIBUTION> main
 
 Substitute the name of your distro (wheezy, sid, trusty, ...) in place of 
<DISTRIBUTION>. Now refresh your sources by running (as root):
 

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

[tor-commits] [webwml/master] Prefer 64bit on Linux

[sebastian]

commit 76e5bbfbf51dc0b6a52ccfff118ffb4750f58078
Author: Sebastian Hahn 
Date:   Wed Aug 17 09:06:10 2016 +0200

Prefer 64bit on Linux
---
 download/en/download-easy.wml | 34 +-
 download/en/download.wml  | 23 ---
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/download/en/download-easy.wml b/download/en/download-easy.wml
index 4bb1517..c740b78 100644
--- a/download/en/download-easy.wml
+++ b/download/en/download-easy.wml
@@ -76,44 +76,44 @@
  Not Using Mac? Download for Windows or Linux
 
   
-
-  
+
+  

  
-   Tor Browser for Linux
-   Version  - Linux (32-Bit) 
https://blog.torproject.org/category/tags/tbb";>Read the release 
announcements!
-   Everything you need to safely browse the Internet. This package 
requires no installation. Just extract it and run.
-   Learn more »
+   Tor Browser for Linux (64-Bit)
+   Version  - Linux (64-Bit) 
https://blog.torproject.org/category/tags/tbb";>Read the release 
announcements!
+   Everything you need to safely browse the Internet. This package 
requires no installation. Just extract it and run.Learn more »
  
  
-   Download
-   
+   Download
+   
 #include 


  Other Languages
- (sig)
 What's This?
+ (sig)
 What's This?

  
  Not Using Linux? Download for Mac or Windows

   
-
-  
+
+  

  
-   Tor Browser for 64-Bit Linux
-   Version  - Linux (64-Bit) 
https://blog.torproject.org/category/tags/tbb";>Read the release 
announcements!
-   Everything you need to safely browse the Internet. This package 
requires no installation. Just extract it and run.Learn more »
+   Tor Browser for Linux (32-Bit)
+   Version  - Linux (32-Bit) 
https://blog.torproject.org/category/tags/tbb";>Read the release 
announcements!
+   Everything you need to safely browse the Internet. This package 
requires no installation. Just extract it and run.
+   Learn more »
  
  
-   Download
-   
+   Download
+   
 #include 


  Other Languages
- (sig)
 What's This?
+ (sig)
 What's This?

  
  Not Using Linux? Download for Mac or Windows
diff --git a/download/en/download.wml b/download/en/download.wml
index 0f3550a..571c7f8 100644
--- a/download/en/download.wml
+++ b/download/en/download.wml
@@ -14,8 +14,8 @@
 Currently Unused
 Tor Browser
 #
-Tor Browser
-64-bit
+Tor Browser (32-Bit)
+Tor Browser (64-Bit)
 
 #include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
 
@@ -121,26 +121,27 @@ you are used to. Please read the full 
list of warnings fo
 #

  
-   Download
-   
+   Download
+   
 #include 


  Other Languages
- (sig)
 What's This?
+ (sig)
 What's This?

-
+   Download Unstable
+
 
-   Download
-   
+   Download
+   
 #include 


  Other Languages
- (sig)
 What's This?
+ (sig)
 What's This?

-   Download Unstable
-
+
+
  
 
  Tor Browser

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

[tor-commits] [webwml/master] Update projects on the volunteer page.

[sebastian]

commit aca2257a0d25efa10a68a1525a9062c3e11effa7
Author: Karsten Loesing 
Date:   Mon Jul 11 17:26:29 2016 +0200

Update projects on the volunteer page.
---
 getinvolved/en/volunteer.wml | 80 +---
 1 file changed, 60 insertions(+), 20 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 20f7190..3e12459 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -124,7 +124,7 @@ meetings around the world.
 Core
 C
 Heavy
-nickm, athena, arma
+nickm, athena, arma, dgoulet, asn, teor
   
 
   
@@ -132,7 +132,7 @@ meetings around the world.
 Bundle
 Javascript, XUL, Scripting
 Heavy
-mikeperry, Pearl Crescent
+mikeperry, Pearl Crescent, GeKo
   
 
   
@@ -155,7 +155,7 @@ meetings around the world.
 Orbot
 User Interface
 Java
-Moderage
+Moderate
 n8fr8
   
 
@@ -260,15 +260,15 @@ meetings around the world.
 Client Service
 Java
 Moderate
-karsten
+karsten, iwakeh
   
 
   
 Atlas
 Client Service
 JavaScript
-None
-
+Moderate
+irl
   
 
   
@@ -283,8 +283,8 @@ meetings around the world.
 Onionoo
 Backend Service
 Java
-Light
-karsten
+Heavy
+karsten, iwakeh
   
 
   
@@ -304,14 +304,6 @@ meetings around the world.
   
 
   
-Weather
-Client Service
-Python
-None
-kaner
-  
-
-  
 GetTor
 Client Service
 Python
@@ -374,6 +366,30 @@ meetings around the world.
 Light
 arma, nickm
   
+
+  
+CollecTor
+Backend Service
+Java
+Heavy
+karsten, iwakeh
+  
+
+  
+metrics-lib
+Library
+Java
+Heavy
+karsten, iwakeh
+  
+
+  
+ExoneraTor
+Client Service
+Java
+Light
+karsten, iwakeh
+  
 
 
 
@@ -602,15 +618,13 @@ meetings around the world.
 
 
 
-https://metrics.torproject.org/";>Metrics (code: https://gitweb.torproject.org/metrics-db.git";>db, https://metrics.torproject.org/";>Metrics (https://gitweb.torproject.org/metrics-web.git";>web)
 
 
 Processing and analytics of consensus data, provided to users via the
 metrics portal. This has been under active development for several years by
-Karsten Loesing. See also https://gitweb.torproject.org/torperf.git";>TorPerf.
+Karsten Loesing.
 
 
 
@@ -788,6 +802,32 @@ meetings around the world.
 we're missing any important papers, please let us know!
 
 
+
+https://collector.torproject.org/";>CollecTor
+(https://gitweb.torproject.org/collector.git";>code,
+https://trac.torproject.org/projects/tor/query?status=!closed&component=Metrics%2FCollecTor&order=priority";>bug
 tracker)
+
+CollecTor is the Tor network data archive that powers other
+services like Metrics and
+Onionoo.
+
+
+metrics-lib
+(https://gitweb.torproject.org/metrics-lib.git";>code,
+https://trac.torproject.org/projects/tor/query?status=!closed&component=Metrics%2Fmetrics-lib&order=priority";>bug
 tracker)
+
+metrics-lib is a Java library that processes Tor network data
+provided by CollecTor or from other
+sources.
+
+
+https://exonerator.torproject.org/";>ExoneraTor
+(https://gitweb.torproject.org/exonerator.git";>code,
+https://trac.torproject.org/projects/tor/query?status=!closed&component=Metrics%2FExoneraTor&order=priority";>bug
 tracker)
+
+ExoneraTor is a service that answers the question whether there was
+a Tor relay running on a given IP address on a given date.
+
 
 
 Project Ideas

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

[tor-commits] [webwml/master] Fix Matt's name

[sebastian]

commit bb2698fb1c902769f9118e1dfe4b7033db2e56e4
Author: Sebastian Hahn 
Date:   Sat Jul 30 08:13:15 2016 +0200

Fix Matt's name
---
 about/en/board.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 0f8537a..932639d 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -14,7 +14,7 @@
 
   
 
-  Matth Blaze
+  Matt Blaze
   Board Chair
   
 Matt is a professor in the computer and information science

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

[tor-commits] [webwml/master] Update board page with new board

[sebastian]

commit 014f513547af396941ba043ca51b718995707b16
Author: Sebastian Hahn 
Date:   Fri Jul 22 13:06:57 2016 +0200

Update board page with new board
---
 about/en/board.wml | 126 ++---
 1 file changed, 71 insertions(+), 55 deletions(-)

diff --git a/about/en/board.wml b/about/en/board.wml
index 426d0ff..0f8537a 100644
--- a/about/en/board.wml
+++ b/about/en/board.wml
@@ -14,88 +14,104 @@
 
   
 
-  Caspar Bowden
-  Director
+  Matth Blaze
+  Board Chair
   
-  Caspar was an advocate for Tor in Europe and a specialist in
-  data protection policy, EU and US surveillance law, PET
-  research, identity management, and information ethics and
-  philosophy. He was formerly the chief privacy advisor at
-  Microsoft. He believed that people in every country deserved
-  the right to privacy irrespective of national borders. He
-  predicted US mass surveillance programs such as PRISM and was
-  vindicated after the Snowden revelations. We miss him deeply.
+Matt is a professor in the computer and information science
+department at the University of Pennsylvania, where he directs the
+Distributed Systems Laboratory. He has been doing research on
+surveillance technology for over 20 years, as well as cryptography,
+secure systems, and public policy.
   
 
 
-  Nick Mathewson
-  Vice-President and Director
+  Linus Nordberg
+  Director
   
-Nick is one of the original developers of Tor.  He's the
-Chief Architect of The Tor Project, Inc.
+Linus is a longtime internet and privacy activist who has been
+involved with Tor since 2009. Linus is a software developer who
+specializes in network security and operating internet services.
+Since his start at Tor he's developed code, run services, and
+advocated for the Tor Project. He's one of the founders of the
+Swedish digital rights organization DFRI (Digitala Fri- och
+Rättigheter) and through that involved in the European umbrella
+public policy organization EDRi (European Digital Rights).
   
 
   
   
 
-  Roger Dingledine
-  President and Director
+  Cindy Cohn
+  Board Treasurer
   
-Original developer of Tor along with Nick Mathewson and Paul
-Syverson. Leading researcher in the anonymous communications
-field.  Frequent speaker at conferences to advocate Tor and
-explain what Tor is and can do. Helps coordinate academic
-researchers.
+Cindy is the Executive Director of the Electronic Frontier
+Foundation (EFF). From 2000 to 2015 she served as EFF’s Legal
+Director as well as its General Counsel.  Cindy first became
+involved with EFF in 1993, when EFF asked her to serve as the
+outside lead attorney in Bernstein v. Dept. of Justice, the
+successful First Amendment challenge to the U.S. export
+restrictions on cryptography. Ms.  Cohn works to ensure that people
+around the world have the right to access information and
+communicate privately and anonymously, including mounting lawsuits
+against NSA spying, providing legal counsel to computer programmers
+building and developing privacy and anonymity tools, and helping to
+develop the Necessary and Proportionate Principles applying
+international human rights standards to digital communications
+surveillance.
   
 
 
-  Julius Mittenzwei
+  Megan Price
   Director
   
-Germany-based lawyer and Internet activist.
+Megan is Executive Director of the Human Rights Data Analysis
+Group, where she designs strategies and methods for statistical
+analysis of human rights data for projects in places like
+Guatemala, Colombia, and Syria. She is lead statistician on a
+project in Guatemala in which she analyzes documents from the
+National Police Archive. She is lead statistician and author on
+three reports on documented deaths in Syria, commissioned by the
+officer of the United Nations High Commissioner of Human Rights.
+Megan is on the Technical Advisory Board for the Office of the
+Prosecutor at the International Criminal Court, a Research Fellow
+at the Carnegie Mellon University Center for Human Rights Science,
+and Human Rights Editor for the Statistical Journal of the
+International 

[tor-commits] [webwml/master] Fix typo (brigde)

[sebastian]

commit 0c83055974f168d3646a8f1f13ec4ac6f2c03eba
Author: Sebastian Hahn 
Date:   Fri Jul 22 10:50:18 2016 +0200

Fix typo (brigde)

Thanks Andrew McGlashan for the report
---
 docs/en/pluggable-transports.wml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index d729353..cb487c3 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -66,7 +66,7 @@
 
 
 
-Become a PT brigde operator:
+Become a PT bridge operator:
 
 How to run PTs to help censored users
 

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

[tor-commits] [webwml/master] changed for an easier phrase

[sebastian]

commit 3900758dfe25b5d56afa517d3cd631f3058beb03
Author: toya 
Date:   Sat Jul 16 18:00:24 2016 -0700

changed for an easier phrase
---
 include/head.wmi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/head.wmi b/include/head.wmi
index 15eee5b..99cea11 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -14,7 +14,7 @@



-   
+   

https://www.torproject.org/images/tor-logo.jpg";>
 



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

[tor-commits] [webwml/master] Merge https://github.com/isabelabagueros/tpo

[sebastian]

commit e4ec0c33c817eb50e3449919fe4a20c8f9188fa9
Merge: c4cd913 1a75d7f
Author: Sebastian Hahn 
Date:   Tue Jul 19 00:46:13 2016 +0200

Merge https://github.com/isabelabagueros/tpo

If you don't like "Tor is a free software that" provide something that's
shorter and better :)

 include/head.wmi | 1 +
 1 file changed, 1 insertion(+)

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

[tor-commits] [webwml/master] Merge pull request #1 from isabelabagueros/description

[sebastian]

commit 8f2b64ac18da6e6ff27a5f7e3e2490f66ee5d247
Merge: c4cd913 870750e
Author: isabelabagueros 
Date:   Sat Jul 16 17:42:22 2016 -0700

Merge pull request #1 from isabelabagueros/description

adding gettor info on meta description for folks who can't open our site

 include/head.wmi | 1 +
 1 file changed, 1 insertion(+)



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

[tor-commits] [webwml/master] adding gettor info on meta description for folks who can't open our website

[sebastian]

commit 870750e14de3155782c8e9a19ab2563d072c008d
Author: toya 
Date:   Sat Jul 16 17:42:33 2016 -0700

adding gettor info on meta description for folks who can't open our website
---
 include/head.wmi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/head.wmi b/include/head.wmi
index f354839..15eee5b 100644
--- a/include/head.wmi
+++ b/include/head.wmi
@@ -14,6 +14,7 @@



+   

https://www.torproject.org/images/tor-logo.jpg";>
 



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

[tor-commits] [webwml/master] Merge pull request #2 from isabelabagueros/new_description

[sebastian]

commit 1a75d7f83aa0785561d8bda3e8dae6864fa455bf
Merge: 8f2b64a 3900758
Author: isabelabagueros 
Date:   Sat Jul 16 18:00:35 2016 -0700

Merge pull request #2 from isabelabagueros/new_description

changed for an easier phrase

 include/head.wmi | 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] Merge pull request #1 from isabelabagueros/pt-updated

[sebastian]

commit 95f432a9c2f7e50ba07172276b60273ad801e018
Merge: c21cddf 41612b5
Author: isabelabagueros 
Date:   Thu Jul 14 22:21:20 2016 -0700

Merge pull request #1 from isabelabagueros/pt-updated

updated pt page organizing content according to audience

 docs/en/pluggable-transports.wml | 235 ---
 1 file changed, 122 insertions(+), 113 deletions(-)



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

[tor-commits] [webwml/master] updated pt page organizing content according to audience

[sebastian]

commit 41612b5f7d12a764c8f4673e682ed9d2e0b7377f
Author: toya 
Date:   Thu Jul 14 22:17:09 2016 -0700

updated pt page organizing content according to audience
---
 docs/en/pluggable-transports.wml | 235 ---
 1 file changed, 122 insertions(+), 113 deletions(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 3cd7033..44e4736 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -10,85 +10,123 @@
 Pluggable Transports
   
   
-Tor: Pluggable Transports
+Tor: Pluggable Transports
+
 
-
-
-An increasing number of censoring countries are using Deep Packet
-Inspection (DPI) to classify Internet traffic flows by protocol.
-While Tor uses bridge relays to
-get around a censor that blocks by IP address, the censor can use
-DPI to recognize and filter Tor traffic flows even when they connect
-to unexpected IP addresses.
+
+Sometimes the Tor network is censored, and you can't connect it.
+
+
+
+An increasing number of censoring countries are using Deep Packet 
Inspection (DPI) to classify Internet traffic flows by protocol. While Tor uses 
bridge relays to get around a censor that 
blocks by IP address, the censor can use DPI to recognize and filter Tor 
traffic flows even when they connect to unexpected IP addresses.
 
 
-
-Pluggable Transports (PT) transform the Tor traffic flow between the client
-and the bridge. This way, censors who monitor traffic between the
-client and the bridge will see innocent-looking transformed traffic
-instead of the actual Tor traffic.
-External programs can talk to Tor clients and Tor bridges using the https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable
-transport API, to make it easier to build interoperable programs.
+Pluggable Transports help you bypass censorship against Tor.
+
+
+
+Pluggable Transports (PT) transform the Tor traffic flow between the 
client and the bridge. This way, censors who monitor traffic between the client 
and the bridge will see innocent-looking transformed traffic instead of the 
actual Tor traffic. External programs can talk to Tor clients and Tor bridges 
using the https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable 
transport API, to make it easier to build interoperable programs.
 
 
-How to use PTs to bypass censorship
-
-  If connections to the Tor network are being blocked by your ISP or
-  country, follow these instructions:
+
+Here you will learn:
+
+
+
+
+How to use a Pluggable Transport
+How to become a PT bridge operator
+How to become a PT developer
+List of PTs organized by their 
status
+
+
+
+How to use PTs to bypass censorship
+If connections to the Tor network are being blocked by your ISP or 
country, follow these instructions:
 
-
-
+
+ 
 
 
+
+
+
+
+Become a PT brigde operator:
+
 How to run PTs to help censored users
-
-  obfs4 is currently the most effective transport to bypass censorship.
-  To learn how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
+
+
+
+Anyone can set up a PT bridge server and help provide bandwidth to 
users who needs it. Once you set up a transport type, your bridge will 
automatically advertise support for the transport in its descriptor.
+
+obfs4 is currently the most effective transport to 
bypass censorship. We are asking voluntters to run bridges for it.
+To learn how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
 
 
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#BecomeaPTbridgeoperator";>Go
 to our wiki to learn how to set up other types of PTs.
+
+
+
+Become a PT developer:
+
+ The links below are the main documentation that will help guide 
through what you should consider while designing your PT:
+
+
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/GuidelinesForDeployingPTs";>Guidelines
 for deploying Pluggable Transports on Tor Browser
+https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>PT technical 
spec​
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/PTEvaluationCriteria";>Pluggable
 Transports Evaluation Criteria
+
+
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports";>Our
 wiki is also a great source of information, such as how to https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#Waystofollowandjointheconversation:";>get
 in touch with the community, https://trac.torproject.org/projects/tor/wiki/doc/Plugg

[tor-commits] [webwml/master] Remove redundant sentence

[sebastian]

commit c4cd913c38b541935c2254ed09e85181eeb1c3b9
Author: Sebastian Hahn 
Date:   Fri Jul 15 13:32:05 2016 +0200

Remove redundant sentence
---
 docs/en/pluggable-transports.wml | 4 
 1 file changed, 4 deletions(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 5e15422..d729353 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -204,10 +204,6 @@
 
 
 
- Also see the unofficial pluggable transports https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports";>wiki
-page for more pluggable transport information.
-
 Our goal is to have a wide variety of Pluggable Transport designs. You 
can check out a https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/list";>full
 list of Pluggables Transports here.
 
 Many are at the research phase now, so it's a perfect time to play with 
them or suggest new designs. Please let us know if you find or start other 
projects that could be useful for making Tor's traffic flows more DPI-resistant!

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

[tor-commits] [webwml/master] Some tweaks to pt page

[sebastian]

commit e11c4d8a1b59ac4f6b9e1e24f72a86bb3e061a1c
Author: Sebastian Hahn 
Date:   Fri Jul 15 13:31:43 2016 +0200

Some tweaks to pt page
---
 docs/en/pluggable-transports.wml | 72 +++-
 1 file changed, 49 insertions(+), 23 deletions(-)

diff --git a/docs/en/pluggable-transports.wml b/docs/en/pluggable-transports.wml
index 44e4736..5e15422 100644
--- a/docs/en/pluggable-transports.wml
+++ b/docs/en/pluggable-transports.wml
@@ -11,28 +11,42 @@
   
   
 Tor: Pluggable Transports
-
+
 
-
-Sometimes the Tor network is censored, and you can't connect it.
-
+
+Sometimes the Tor network is censored, and you can't connect to
+it.
+
 
-
-An increasing number of censoring countries are using Deep Packet 
Inspection (DPI) to classify Internet traffic flows by protocol. While Tor uses 
bridge relays to get around a censor that 
blocks by IP address, the censor can use DPI to recognize and filter Tor 
traffic flows even when they connect to unexpected IP addresses.
+
+
+An increasing number of censoring countries are using Deep Packet
+Inspection (DPI) to classify Internet traffic flows by protocol.
+While Tor uses bridge relays to
+get around a censor that blocks by IP address, the censor can use
+DPI to recognize and filter Tor traffic flows even when they connect
+to unexpected IP addresses.
 
 
 Pluggable Transports help you bypass censorship against Tor.
-
+
 
-
-Pluggable Transports (PT) transform the Tor traffic flow between the 
client and the bridge. This way, censors who monitor traffic between the client 
and the bridge will see innocent-looking transformed traffic instead of the 
actual Tor traffic. External programs can talk to Tor clients and Tor bridges 
using the https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable 
transport API, to make it easier to build interoperable programs.
+
+
+Pluggable Transports (PT) transform the Tor traffic flow between the client
+and the bridge. This way, censors who monitor traffic between the client
+and the bridge will see innocent-looking transformed traffic instead of the
+actual Tor traffic.
+External programs can talk to Tor clients and Tor bridges using the https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>pluggable
+transport API, to make it easier to build interoperable programs.
 
 
 
-Here you will learn:
-
+Learn more:
+
 
-
+
 
 How to use a Pluggable Transport
 How to become a PT bridge operator
@@ -44,7 +58,7 @@
 How to use PTs to bypass censorship
 If connections to the Tor network are being blocked by your ISP or 
country, follow these instructions:
 
-
+
  
 
 
@@ -58,27 +72,39 @@
 
 
 
-Anyone can set up a PT bridge server and help provide bandwidth to 
users who needs it. Once you set up a transport type, your bridge will 
automatically advertise support for the transport in its descriptor.
+
+Anyone can set up a PT bridge server and help provide bandwidth to users
+who needs it. Once you set up a transport type, your bridge will
+automatically advertise support for the transport in its descriptor.
+
 
-obfs4 is currently the most effective transport to 
bypass censorship. We are asking voluntters to run bridges for it.
-To learn how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
 wiki page.
+
+obfs4 is currently the most effective transport to bypass
+censorship. We are asking voluntters to run bridges for it. To learn
+how to run this transport, please visit the https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/obfs4proxy";>obfs4proxy
+wiki page.
 
 
-https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#BecomeaPTbridgeoperator";>Go
 to our wiki to learn how to set up other types of PTs.
+
+https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports#BecomeaPTbridgeoperator";>Go
+to our wiki to learn how to set up other types of PTs.
+
 
 
 
 Become a PT developer:
 
- The links below are the main documentation that will help guide 
through what you should consider while designing your PT:
+ The links below are the main documentation for PT developers
 
 
 https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/GuidelinesForDeployingPTs";>Guidelines
 for deploying Pluggable Transports on Tor Browser
-https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>PT technical 
spec​
+https://gitweb.torproject.org/torspec.git/tree/pt-spec.txt";>PT technical 
spec
 https://trac.torproject.org/projects/tor/wiki/doc/PluggableTransports/P

[tor-commits] [webwml/master] more link fixing

[sebastian]

commit c21cddf4bc79fe33d9be80d1df97d3643606488a
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:45:02 2016 +0200

more link fixing
---
 docs/en/faq.wml  | 10 +-
 docs/en/tor-doc-relay.wml|  3 ++-
 en/index.wml |  2 +-
 getinvolved/en/volunteer.wml | 11 ---
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index f98bc11..c238ca6 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -1482,14 +1482,6 @@ 
href="http://www.crowdstrike.com/community-tools/index.html#tool-79";>proposed
 Exitpolicy reject *:*
 BridgeRelay 1  # only add this line if you want to be a bridge
 
-
-If you've installed Obfsproxy,
-you'll need to add one more line:
-
-
-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
-
 
 
 
@@ -2581,7 +2573,7 @@ short)
 
 Several countries, including China and Iran, have found ways to
 detect and block connections to Tor bridges.
-Obfsproxy bridges address
+Obfsproxy bridges address
 this by adding another layer of obfuscation.
 
 
diff --git a/docs/en/tor-doc-relay.wml b/docs/en/tor-doc-relay.wml
index c932c33..7f897d3 100644
--- a/docs/en/tor-doc-relay.wml
+++ b/docs/en/tor-doc-relay.wml
@@ -55,9 +55,10 @@
 ContactInfo human@...
 
 
+# TODO: Update link to PT setup docs
 If you want to be a bridge, read about the BridgeRelay and
 ServerTransportPlugin values on
+href="">on
 this page.
 
 Tor will use all your bandwidth if you don't set limits for it. Some
diff --git a/en/index.wml b/en/index.wml
index fededd4..836d3b0 100644
--- a/en/index.wml
+++ b/en/index.wml
@@ -118,7 +118,7 @@
 -->
   
 
-
 Pluggable 
Transports
 Pluggable transports help you circumvent censorship.
diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 8d9335d..20f7190 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -518,17 +518,6 @@ meetings around the world.
 TorBirdy is Torbutton for Thunderbird and related Mozilla mail clients.
 
 
-
-Obfsproxy (https://gitweb.torproject.org/pluggable-transports/obfsproxy.git";>code,
-https://trac.torproject.org/projects/tor/query?status=accepted&status=assigned&status=needs_review&status=new&status=reopened&component=Obfuscation%2FObfsproxy&order=priority";>bug
-tracker)
-
-
-A proxy that shapes Tor traffic, making it harder for censors to detect and
-block Tor. This has both a C and python implementation.
-
-
 
 https://crypto.stanford.edu/flashproxy/";>Flash Proxy (https://gitweb.torproject.org/flashproxy.git";>code, https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Fix up rewrite rules

[sebastian]

commit 9ed889a61c97033442504e96f4525b40b4e0b63b
Author: Sebastian Hahn 
Date:   Thu Jul 14 21:32:23 2016 +0200

Fix up rewrite rules
---
 .htaccess | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index d6d7dc4..407b61f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -32,9 +32,9 @@ RewriteRule ^projects/$ /projects/projects [R=301,L]
 
 #Pluggable Transports
 RewriteRule ^PT/$ /docs/pluggable-transports [R=301,L]
-RewriteRule ^projects/obfsproxy/$ /docs/pluggable-transports [R=301,L]
-RewriteRule ^projects/obfsproxy-debian-instructions/$ 
/docs/pluggable-transports [R=410,L]
-RewriteRule ^projects/obfsproxy-instructions/$ /docs/pluggable-transports 
[R=410,L]
+RewriteRule ^projects/obfsproxy-debian-instructions(.*) 
/docs/pluggable-transports [R=410,L]
+RewriteRule ^projects/obfsproxy-instructions(.*) /docs/pluggable-transports 
[R=410,L]
+RewriteRule ^projects/obfsproxy(.*) /docs/pluggable-transports [R=301,L]
 
 # GetInvolved
 RewriteRule ^getinvolved/$ /getinvolved/volunteer [R=301,L]

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

[tor-commits] [webwml/master] replace obfsproxy with PT in projects page and navbar

[sebastian]

commit 8eaa93901ce09178ba260883c0d107820bb306a6
Author: Nima Fatemi 
Date:   Wed Jul 6 22:43:17 2016 +

replace obfsproxy with PT in projects page and navbar
---
 projects/en/projects.wml | 10 ++
 projects/en/sidenav.wmi  | 10 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/projects/en/projects.wml b/projects/en/projects.wml
index b5c844b..985b050 100644
--- a/projects/en/projects.wml
+++ b/projects/en/projects.wml
@@ -52,12 +52,14 @@ default and sends all of its traffic over Tor.
 
 
 
-
 Obfsproxy
-Obfsproxy is a pluggable transports proxy. It shapes Tor traffic,
-making it harder for censors to detect and block the Tor protocol.
+href="">Pluggable Transports
+Pluggable Transports (PT) transform the Tor traffic flow between the client
+and the bridge. This way, censors who monitor traffic between the
+client and the bridge will see innocent-looking transformed traffic
+instead of the actual Tor traffic.
 
 
 
diff --git a/projects/en/sidenav.wmi b/projects/en/sidenav.wmi
index 160d20c..4be3c78 100644
--- a/projects/en/sidenav.wmi
+++ b/projects/en/sidenav.wmi
@@ -15,11 +15,11 @@
 #
 # url - the path to the wml page, as used the the  tag. This tag ensures
 # that links will point to the current language if supported, and alternately
-# the english version 
+# the english version
 #
 # txt - the link text to be displayed. Different translations will
-# need to supply alternate txt 
- 
+# need to supply alternate txt
+
 <:
   my $sidenav;
   $sidenav = [
@@ -47,8 +47,8 @@
   {'url'  => 'https://metrics.torproject.org/',
'txt'  => 'Metrics Portal',
   },
-  {'url'  => 'projects/obfsproxy',
-   'txt'  => 'Obfsproxy',
+  {'url'  => 'docs/pluggable-transports',
+   'txt'  => 'Pluggable Transports',
   },
   {'url' => 'https://shadow.cs.umn.edu/',
'txt' => 'Shadow',



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