Nick Mathewson
7ef2939e5a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-11 11:16:59 -04:00
Nick Mathewson
82d8944928
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2013-10-11 11:16:45 -04:00
Karsten Loesing
3b0265198f
Update to the October 2013 GeoIP database.
2013-10-11 13:36:30 +02:00
Nick Mathewson
73a0bb16b9
Partially revert "Clarify who learns about ContactInfo."
...
This reverts the torrc.sample.in changes from commit
66a04a6ac3
2013-10-09 12:02:53 -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
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
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
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
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
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
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
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
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
Karsten Loesing
32114d70ae
Update to the January 2013 GeoIP database.
2013-01-05 08:18:26 +01:00
Nick Mathewson
579808d4cd
Merge remote-tracking branch 'origin/maint-0.2.3'
...
Conflicts:
src/config/geoip
2012-12-13 12:52:44 -05:00
Nick Mathewson
52bf1556b1
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
2012-12-13 12:51:28 -05:00
Karsten Loesing
6bdfa295b5
Add link explaining how the geoip file was created.
2012-12-13 08:45:25 +01:00
Karsten Loesing
c9a5d613a6
Update to the December 2012 GeoIP database.
2012-12-13 08:44:30 +01:00
Karsten Loesing
d2cfd52d2c
Update to the November 2012 GeoIP database.
2012-12-13 08:44:20 +01:00
Karsten Loesing
c718921d34
Update to the December 2012 GeoIP database.
2012-12-06 11:29:47 +01:00
Karsten Loesing
35d09dd6ac
Update to the November 2012 GeoIP database.
2012-11-27 21:26:52 -05:00
Karsten Loesing
2bf195d0ce
Add script to fix "A1" entries in geoip file.
...
Fixes #6266 .
2012-11-27 21:24:07 -05:00
Nick Mathewson
b17aa28e46
Actually distribute the geoip6 file.
...
Fixes a bug (with no ticket) on 0.2.4.6-alpha.
2012-11-13 21:24:28 -05:00
Linus Nordberg
96a7313475
Update geoip6.
2012-10-17 10:54:53 +02:00
Karsten Loesing
c03e3d66a9
Minor tweaks and comments to nils' geoip v6 code.
2012-10-17 10:54:52 +02:00
nils
abb886014e
Add GeoIP database for IPv6 addresses
2012-10-17 10:54:52 +02:00
Roger Dingledine
622f90904c
4aff97cfc didn't update the 'last modified' timestamp
2012-09-22 06:11:05 -04:00
Nick Mathewson
45439bfced
Revert "6819: typo in torrc.sample.in"
...
This reverts commit 4aff97cfc7
2012-09-12 15:37:47 -04:00
Nick Mathewson
6a8861574b
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-09-12 11:09:10 -04:00
Nick Mathewson
4aff97cfc7
6819: typo in torrc.sample.in
2012-09-12 11:08:30 -04:00
