sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.4' into release-0.2.4

This commit is contained in:
Roger Dingledine 2013-06-08 15:12:29 -04:00
parent 2d4aebaf76 c860a96ecb
commit 34c70ba9e6
3 changed files with 9170 additions and 96887 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/geoip-june2013 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update to the June 5 2013 Maxmind GeoLite Country database.

4
doc/tor.1.txt
View File

@ -2012,12 +2012,12 @@ The following options are used for running a testing Tor network.
**TestingTorNetwork** is set. (Default: 30 minutes)
**TestingV3AuthInitialVoteDelay** __N__ **minutes**|**hours**::
Like TestingV3AuthInitialVoteDelay, but for initial voting interval before
Like V3AuthVoteDelay, but for initial voting interval before
the first consensus has been created. Changing this requires that
**TestingTorNetwork** is set. (Default: 5 minutes)
**TestingV3AuthInitialDistDelay** __N__ **minutes**|**hours**::
Like TestingV3AuthInitialDistDelay, but for initial voting interval before
Like V3AuthDistDelay, but for initial voting interval before
the first consensus has been created. Changing this requires that
**TestingTorNetwork** is set. (Default: 5 minutes)

106050
src/config/geoip
View File

File diff suppressed because it is too large Load Diff