aboutsummaryrefslogtreecommitdiff
path: root/src/config
Commit message (Expand)AuthorAge
* 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."•••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. 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.•••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. 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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 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.•••Script changes now catch more cases when our manual substitutions need to be updated. Manual substitutions are updated to May 2013 database. 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.•••MaxMind changed twelve 'A1' ranges in their April 2013 database that the the substitution algorithm couldn't fix. Fix them manually. 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.•••MaxMind added fourteen new 'A1' ranges in their March 2013 database that the automatic substitution algorithm couldn't fix. Fix them manually. Karsten Loesing2013-03-07
* | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-03-11
|\ \ \ \ | |/ / / |/| / / | |/ /
generated by cgit v1.2.3 (git 2.47.1) at 2025-03-19 07:04:22 +0000