Merge remote-tracking branch 'origin/maint-0.2.5'

README

@@ -10,17 +10,16 @@ Home page:
         https://www.torproject.org/
 
 Download new versions:
-        https://www.torproject.org/download.html
+        https://www.torproject.org/download/download.html
 
 Documentation, including links to installation and setup instructions:
-        https://www.torproject.org/documentation.html
+        https://www.torproject.org/docs/documentation.html
 
 Making applications work with Tor:
-        https://wiki.torproject.org/noreply/TheOnionRouter/TorifyHOWTO
+        https://wiki.torproject.org/projects/tor/wiki/doc/TorifyHOWTO
 
 Frequently Asked Questions:
-        https://www.torproject.org/faq.html
+        https://www.torproject.org/docs/faq.html
-        https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ
 
 
 To get started working on Tor development:

changes/bug12830

@@ -0,0 +1,4 @@
+  o Documentation:
+    - Adjust the URLs in the README to refer to the new locations of
+      several documents on the website. Patch from Matt Pagan. Fixes
+      bug 12830.

changes/geoip-august2014

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip to the August 7 2014 Maxmind GeoLite2 Country database.
+

changes/geoip6-august2014

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database.
+

doc/tor.1.txt

@@ -1698,7 +1698,7 @@ is non-zero):
 
 [[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**::
     When this option is enabled and BridgeRelay is also enabled, and we have
-    GeoIP data, Tor keeps a keep a per-country count of how many client
+    GeoIP data, Tor keeps a per-country count of how many client
     addresses have contacted it so that it can help the bridge authority guess
     which countries have blocked access to it. (Default: 1)