aboutsummaryrefslogtreecommitdiff
path: root/src/config
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'karsten/geoip2regcountry'Nick Mathewson2014-02-25
|\
| * Fall back to registered country if necessary.Karsten Loesing2014-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-02-25
|\ \
| * \ Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2014-02-25
| |\ \
| | * | Fix geoip by falling back to registered countries.Karsten Loesing2014-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. """
* | | | Download MaxMind's geoip file over https.Karsten Loesing2014-02-25
| |_|/ |/| | | | | | | | | | | | | | | | | 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.
* | | Include instructions on generating geoip files.Karsten Loesing2014-02-21
| | | | | | | | | | | | Implements #10924.
* | | Merge remote-tracking branch 'karsten/mmdb-convert'Nick Mathewson2014-02-15
|\ \ \
| * | | Exclude Teredo IPv6 prefix from geoip6.Karsten Loesing2014-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Don't zero-pad day of the month.Karsten Loesing2014-02-08
| | | |
| * | | Add script to convert GeoLite2 country databases.Karsten Loesing2014-02-08
| | | | | | | | | | | | | | | | | | | | Copied over from https://github.com/nmathewson/mmdb-convert, commit 52f0d43408ed3a0fe7c3b2fa7099da7f6b7c4502.
| * | | Remove script to clean up GeoLite country databases.Karsten Loesing2014-02-08
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-02-15
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'karsten/geoip6-feb2014' into maint-0.2.4Nick Mathewson2014-02-15
| |\ \
| | * | Update geoip6 to the February 2014 GeoIP database.Karsten Loesing2014-02-13
| | | |
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2014-02-15
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge remote-tracking branch 'karsten/geoip-feb2014' into maint-0.2.3Nick Mathewson2014-02-15
| | |\
| | | * Update to the February 2014 GeoIP database.Karsten Loesing2014-02-08
| | | |
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'Nick Mathewson2013-10-11
|\ \ \ \
| * | | | Modify 1 and delete 1 geoip A1 substitution.Karsten Loesing2013-10-11
| | | | |
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-10-11
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-10-11
| |\| |
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-10-11
| | |\|
| | | * Update to the October 2013 GeoIP database.Karsten Loesing2013-10-11
| | | |
| * | | Partially revert "Clarify who learns about ContactInfo."Nick Mathewson2013-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Or maybe it is 2013. Who can say?Nick Mathewson2013-10-09
| | | |
* | | | Update last modified timestamp of torrc.sample.in.Karsten Loesing2013-10-09
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-10-09
|\| | |
| * | | Clarify who learns about ContactInfo.Karsten Loesing2013-10-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-sep2013'Nick Mathewson2013-09-16
|\ \ \ \
| * | | | Remove 17 now unused manual A1 substitutions.Karsten Loesing2013-09-10
| | | | |
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-09-16
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-09-16
| |\| |
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-09-16
| | |\|
| | | * Update to the September 2013 GeoIP database.Karsten Loesing2013-09-10
| | | |
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-aug2013'Nick Mathewson2013-08-12
|\ \ \ \
| * | | | Add 2, update 1, and remove 3 manual A1 substitutions.Karsten Loesing2013-08-12
| | | | |
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-08-12
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-08-12
| |\| |
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-08-12
| | |\|
| | | * Update to the August 2013 GeoIP database.Karsten Loesing2013-08-12
| | | |
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013'Nick Mathewson2013-07-08
|\ \ \ \
| * | | | Add 2 new manual A1 substitutions.Karsten Loesing2013-07-08
| | | | |
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-07-08
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-07-08
| |\| |
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-07-08
| | |\|
| | | * Update to the July 2013 GeoIP database.Karsten Loesing2013-07-08
| | | |
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013'Nick Mathewson2013-06-05
|\ \ \ \
| * | | | Remove 9 now unused manual A1 substitutions.Karsten Loesing2013-06-05
| | | | |
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-05
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-27 20:42:34 +0000