summaryrefslogtreecommitdiff
path: root/src/config
AgeCommit message (Collapse)Author
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-03-09Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4Nick Mathewson
2015-03-09Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-03-09Update geoip6 to the March 3 2015 database.Karsten Loesing
2015-03-09Update geoip to the March 3 2015 database.Karsten Loesing
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2015-01-23Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4Nick Mathewson
2015-01-23Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2015-01-22Update geoip6 to the January 7 2015 database.Karsten Loesing
2015-01-22Update geoip to the January 7 2015 database.Karsten Loesing
2014-11-24Merge remote-tracking branch 'origin/maint-0.2.5'Nick Mathewson
2014-11-24Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5Nick Mathewson
2014-11-24Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4Nick Mathewson
2014-11-24Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson
2014-11-24Update geoip6 to the November 15 2014 database.Karsten Loesing
2014-11-24Update geoip to the November 15 2014 database.Karsten Loesing
2014-09-16torrc.sample: Fix unitsPeter Palfrader
2014-09-02Use 'Bytes', not 'B', in torrc.sample.Nick Mathewson
Also put this change into torrc.minimal.in-staging Closes ticket 10343
2014-09-02Fix: typo in torrc.sample.inMagnus Nord
2014-09-02Divide torrc.sample into torrc.sample and torrc.minimalNick Mathewson
torrc.minimal is now the one that should change as infrequently as possible. To schedule an change to go into it eventually, make your change to torrc.minimal.in-sample. torrc.sample is now the volatile one: we can change it to our hearts' content. Closes ticket #11144
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
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion