Browse Source

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

Nick Mathewson 11 years ago
parent
commit
938deecc87
7 changed files with 617 additions and 1392 deletions
  1. 4 5
      README
  2. 4 0
      changes/bug12830
  3. 3 0
      changes/geoip-august2014
  4. 3 0
      changes/geoip6-august2014
  5. 1 1
      doc/tor.1.txt
  6. 324 126
      src/config/geoip
  7. 278 1260
      src/config/geoip6

+ 4 - 5
README

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

+ 4 - 0
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.

+ 3 - 0
changes/geoip-august2014

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

+ 3 - 0
changes/geoip6-august2014

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

+ 1 - 1
doc/tor.1.txt

@@ -1698,7 +1698,7 @@ is non-zero):
 
 
 [[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**::
 [[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**::
     When this option is enabled and BridgeRelay is also enabled, and we have
     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
     addresses have contacted it so that it can help the bridge authority guess
     which countries have blocked access to it. (Default: 1)
     which countries have blocked access to it. (Default: 1)
 
 

File diff suppressed because it is too large
+ 324 - 126
src/config/geoip


File diff suppressed because it is too large
+ 278 - 1260
src/config/geoip6


Some files were not shown because too many files changed in this diff