aboutsummaryrefslogtreecommitdiff
path: root/src/config
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'karsten/geoip2regcountry'Nick Mathewson2014-02-25
|\
| * Fall back to registered country if necessary.Karsten Loesing2014-02-25
* | 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
* | | | Download MaxMind's geoip file over https.Karsten Loesing2014-02-25
| |_|/ |/| |
* | | Include instructions on generating geoip files.Karsten Loesing2014-02-21
* | | Merge remote-tracking branch 'karsten/mmdb-convert'Nick Mathewson2014-02-15
|\ \ \
| * | | Exclude Teredo IPv6 prefix from geoip6.Karsten Loesing2014-02-13
| * | | Don't zero-pad day of the month.Karsten Loesing2014-02-08
| * | | Add script to convert GeoLite2 country databases.Karsten Loesing2014-02-08
| * | | 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
* | | | 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
* | | | 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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /