aboutsummaryrefslogtreecommitdiff
path: root/src/config
Commit message (Expand)AuthorAge
* 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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-05
| |\| |
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-06-05
| | |\|
| | | * Update to the June 2013 GeoIP database.Karsten Loesing2013-06-05
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-may2013'Nick Mathewson2013-05-20
|\ \ \ \
| * | | | Update GeoIP file script and manual substitutions.Karsten Loesing2013-05-13
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-05-20
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-05-20
| |\| |
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-05-20
| | |\|
| | | * Update to the May 2013 GeoIP database.Karsten Loesing2013-05-13
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013'Nick Mathewson2013-04-08
|\ \ \ \
| * | | | Manually fix 'A1' ranges.Karsten Loesing2013-04-08
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-04-08
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-04-08
| |\| |
| | * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-04-08
| | |\|
| | | * Update to the April 2013 GeoIP database.Karsten Loesing2013-04-08
* | | | Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013'Nick Mathewson2013-03-11
|\ \ \ \ | |/ / / |/| | |
| * | | Manually fix yet another fourteen 'A1' ranges.Karsten Loesing2013-03-07
* | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-03-11
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-03-11
| |\|
| | * Update to the March 2013 GeoIP database.Karsten Loesing2013-03-07
* | | Merge remote-tracking branch 'karsten/geoip-manual-update'Nick Mathewson2013-02-08
|\ \ \
| * | | Comment out now obsolete change in geoip-manual.Karsten Loesing2013-02-08
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2013-02-08
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-02-08
| |\|
| | * Update to the February 2013 GeoIP database.Karsten Loesing2013-02-08
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2013-01-14
|\| |
| * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-01-14
| |\|
| | * Update to the January 2013 GeoIP database.Karsten Loesing2013-01-05
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-12-13
|\| |
| * | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2012-12-13
| |\|
| | * Add link explaining how the geoip file was created.Karsten Loesing2012-12-13
| | * Update to the December 2012 GeoIP database.Karsten Loesing2012-12-13
| | * Update to the November 2012 GeoIP database.Karsten Loesing2012-12-13
| * | Revert "6819: typo in torrc.sample.in"Nick Mathewson2012-09-12
* | | Update to the December 2012 GeoIP database.Karsten Loesing2012-12-06