summaryrefslogtreecommitdiff
path: root/src/config
AgeCommit message (Collapse)Author
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-08-13Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4Nick Mathewson
2014-08-13Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-08-13Update geoip6 to the August 7 2014 database.Karsten Loesing
2014-08-13Update geoip to the August 7 2014 database.Karsten Loesing
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-07-21Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4Nick Mathewson
2014-07-21Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-07-18Update geoip6 to the July 10 2014 database.Karsten Loesing
2014-07-18Update geoip to the July 10 2014 database.Karsten Loesing
2014-06-10Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-06-10Merge remote-tracking branch 'karsten/geoip6-jun2014' into maint-0.2.4Nick Mathewson
2014-06-10Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-06-10Update geoip to the June 4 2014 database.Karsten Loesing
2014-06-10Update geoip6 to the June 4 2014 database.Karsten Loesing
2014-02-25Merge remote-tracking branch 'karsten/geoip2regcountry'Nick Mathewson
2014-02-25Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-02-25Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-02-25Fix geoip by falling back to registered countries.Karsten Loesing
See 1d2179bc900f1646a5491b65294e78b175e70056 in master for details. """ Fall back to registered country if necessary. When extracting geoip and geoip6 files from MaxMind's GeoLite2 Country database, we only look at country->iso_code which is the two-character ISO 3166-1 country code of the country where MaxMind believes the end user is located. But if MaxMind thinks a range belongs to anonymous proxies, they don't put anything there. Hence, we omit those ranges and resolve them all to '??'. That's not what we want. What we should do is first try country->iso_code, and if there's no such key, try registered_country->iso_code which is the country in which the ISP has registered the IP address. In short: let's fill all A1 entries with what ARIN et. al think. """
2014-02-25Fall back to registered country if necessary.Karsten Loesing
When extracting geoip and geoip6 files from MaxMind's GeoLite2 Country database, we only look at country->iso_code which is the two-character ISO 3166-1 country code of the country where MaxMind believes the end user is located. But if MaxMind thinks a range belongs to anonymous proxies, they don't put anything there. Hence, we omit those ranges and resolve them all to '??'. That's not what we want. What we should do is first try country->iso_code, and if there's no such key, try registered_country->iso_code which is the country in which the ISP has registered the IP address. In short: let's fill all A1 entries with what ARIN et. al think.
2014-02-25Download MaxMind's geoip file over https.Karsten Loesing
If the cert turns out to be invalid or if wget is otherwise unable to verify it, it's going to return an error and not download the file for us. Spotted by nickm.
2014-02-21Include instructions on generating geoip files.Karsten Loesing
Implements #10924.
2014-02-15Merge remote-tracking branch 'karsten/mmdb-convert'Nick Mathewson
2014-02-15Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2014-02-15Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4Nick Mathewson
2014-02-15Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-02-15Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3Nick Mathewson
2014-02-13Update geoip6 to the February 2014 GeoIP database.Karsten Loesing
2014-02-13Exclude Teredo IPv6 prefix from geoip6.Karsten Loesing
The latest GeoLite2 database includes a pointer from 2001::/32 to the root node of the IPv4 address space in the tree. We need to exclude this whole address space from geoip6, similar to how we exclude IPv4-mapped IPv6 addresses and the 6to4 mapping subnet.
2014-02-08Update to the February 2014 GeoIP database.Karsten Loesing
2014-02-08Don't zero-pad day of the month.Karsten Loesing
2014-02-08Add script to convert GeoLite2 country databases.Karsten Loesing
Copied over from https://github.com/nmathewson/mmdb-convert, commit 52f0d43408ed3a0fe7c3b2fa7099da7f6b7c4502.
2014-02-08Remove script to clean up GeoLite country databases.Karsten Loesing
2013-10-11Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'Nick Mathewson
2013-10-11Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-10-11Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-10-11Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2013-10-11Update to the October 2013 GeoIP database.maint-0.2.2Karsten Loesing
2013-10-11Modify 1 and delete 1 geoip A1 substitution.Karsten Loesing
2013-10-09Or maybe it is 2013. Who can say?Nick Mathewson
2013-10-09Partially revert "Clarify who learns about ContactInfo."Nick Mathewson
This reverts the torrc.sample.in changes from commit 66a04a6ac334775dc396025e0c15fa49eca138a7. We're going to not make this change in 0.2.4, since changing torrc.sample.in makes all the debian users do some pointless busywork. see tor-dev discusion of 9 Oct 2013.
2013-10-09Update last modified timestamp of torrc.sample.in.Karsten Loesing
2013-10-09Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-10-09Clarify who learns about ContactInfo.Karsten Loesing
Explicitly include bridges, and note that we archive and publish all descriptors. (We are not yet publishing ContactInfo lines contained in bridge descriptors, but maybe we'll want to do that soon, so let's err on the side of caution here.) Related to #9854.
2013-09-16Merge remote-tracking branch 'karsten/geoip-manual-update-sep2013'Nick Mathewson
2013-09-16Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-09-16Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2013-09-16Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2013-09-10Update to the September 2013 GeoIP database.Karsten Loesing
2013-09-10Remove 17 now unused manual A1 substitutions.Karsten Loesing
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion