Nick Mathewson
882fb8383d
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-09 09:45:21 -04:00
Karsten Loesing
66a04a6ac3
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 .
2013-10-09 09:43:18 -04:00
Nick Mathewson
57859980a8
Merge remote-tracking branch 'karsten/geoip-manual-update-sep2013'
2013-09-16 12:48:49 -04:00
Nick Mathewson
3892e03cfc
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-16 12:48:45 -04:00
Nick Mathewson
ace95c525c
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-09-16 12:47:05 -04:00
Nick Mathewson
b46353b793
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-09-16 12:46:50 -04:00
Karsten Loesing
13d192c1d8
Update to the September 2013 GeoIP database.
2013-09-10 15:00:06 +02:00
Karsten Loesing
e7361aa40a
Remove 17 now unused manual A1 substitutions.
2013-09-10 14:56:39 +02:00
Nick Mathewson
9abbfef2f7
Merge remote-tracking branch 'karsten/geoip-manual-update-aug2013'
2013-08-12 09:47:30 -04:00
Nick Mathewson
5d706dd27a
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-08-12 09:47:17 -04:00
Nick Mathewson
3433b7ce39
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-08-12 09:45:07 -04:00
Nick Mathewson
64410cc888
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-08-12 09:44:36 -04:00
Karsten Loesing
41bf8fa889
Update to the August 2013 GeoIP database.
2013-08-12 15:26:36 +02:00
Karsten Loesing
fa62d966c9
Add 2, update 1, and remove 3 manual A1 substitutions.
2013-08-12 15:22:14 +02:00
Nick Mathewson
dd90ab4121
Merge remote-tracking branch 'karsten/geoip-manual-update-jul2013'
2013-07-08 09:23:39 -04:00
Nick Mathewson
20634fac54
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-07-08 09:23:09 -04:00
Nick Mathewson
c78c8de015
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-07-08 09:22:49 -04:00
Nick Mathewson
0b9c515870
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-07-08 09:22:00 -04:00
Karsten Loesing
2a61b0dd6b
Update to the July 2013 GeoIP database.
2013-07-08 10:21:28 +02:00
Karsten Loesing
1a43dfa603
Add 2 new manual A1 substitutions.
2013-07-08 10:14:42 +02:00
Nick Mathewson
bcdc002269
Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013'
2013-06-05 11:22:48 -04:00
Nick Mathewson
7159e19ea9
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-06-05 11:22:36 -04:00
Nick Mathewson
c860a96ecb
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-06-05 11:22:19 -04:00
Nick Mathewson
fe689de084
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-06-05 11:22:02 -04:00
Karsten Loesing
d34753174e
Update to the June 2013 GeoIP database.
2013-06-05 08:43:03 +02:00
Karsten Loesing
9b233acd03
Remove 9 now unused manual A1 substitutions.
2013-06-05 08:40:39 +02:00
Nick Mathewson
826daaf726
Merge remote-tracking branch 'karsten/geoip-manual-update-may2013'
2013-05-20 12:42:36 -04:00
Nick Mathewson
c90c370ab3
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-05-20 12:37:58 -04:00
Nick Mathewson
0c2fb64d6f
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-05-20 12:37:21 -04:00
Nick Mathewson
78735f8778
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-05-20 12:34:59 -04:00
Karsten Loesing
f8053179c9
Update to the May 2013 GeoIP database.
2013-05-13 15:37:43 +02:00
Karsten Loesing
d93caf7f0a
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.
2013-05-13 15:35:01 +02:00
Nick Mathewson
5d4f43eb4a
Merge remote-tracking branch 'karsten/geoip-manual-update-apr2013'
2013-04-08 11:10:37 -04:00
Nick Mathewson
1bbfadfa61
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-04-08 11:10:07 -04:00
Nick Mathewson
6acf0ac285
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-04-08 11:09:50 -04:00
Nick Mathewson
9630fb917f
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-04-08 11:09:26 -04:00
Karsten Loesing
b41f03f6df
Update to the April 2013 GeoIP database.
2013-04-08 12:18:40 +02:00
Karsten Loesing
c8925550c6
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.
2013-04-08 12:13:12 +02:00
Nick Mathewson
d89b8e0751
Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013'
2013-03-11 13:34:32 -04:00
Nick Mathewson
ef4db31693
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-03-11 13:32:16 -04:00
Nick Mathewson
c6ca199888
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-03-11 13:32:01 -04:00
Karsten Loesing
3dde6d5d29
Update to the March 2013 GeoIP database.
2013-03-07 20:58:31 +01:00
Karsten Loesing
5cad78c2ce
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.
2013-03-07 20:55:46 +01:00
Nick Mathewson
fd1c2a13e7
Merge remote-tracking branch 'karsten/geoip-manual-update'
2013-02-08 10:37:34 -05:00
Nick Mathewson
a24f29ec5d
Merge remote-tracking branch 'origin/maint-0.2.3'
2013-02-08 10:36:51 -05:00
Nick Mathewson
b840b76b04
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-02-08 10:36:34 -05:00
Karsten Loesing
7f805b6048
Comment out now obsolete change in geoip-manual.
2013-02-08 14:42:07 +01:00
Karsten Loesing
adff7f944a
Update to the February 2013 GeoIP database.
2013-02-08 14:39:25 +01:00
Nick Mathewson
cb24852ec5
Merge remote-tracking branch 'origin/maint-0.2.3'
2013-01-14 14:24:53 -05:00
Nick Mathewson
1625cddf3a
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-01-14 14:24:19 -05:00
Nick Mathewson
Karsten Loesing