877dd1d6c8
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-20 12:15:23 -05:00
428f8a375b
Update geoip and geoip6 to the December 6 2017 database.
2017-12-20 17:36:29 +01:00
c9b76a12f5
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-11-11 12:23:33 -05:00
6f8c32b7de
Update geoip and geoip6 to the November 6 2017 database.
2017-11-10 10:14:09 +01:00
d6bdec1595
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-10-05 11:03:35 -04:00
b9d9b16b76
Update geoip and geoip6 to the October 4 2017 database.
2017-10-05 16:56:14 +02:00
bcf2b413c3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-09-07 15:18:00 -04:00
09618ffe38
Update geoip and geoip6 to the September 6 2017 database.
2017-09-07 21:06:16 +02:00
93b28972c1
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-08-03 08:44:31 -04:00
1280de42a4
Update geoip and geoip6 to the August 3 2017 database.
2017-08-03 10:00:54 +02:00
a48ae2aa67
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-08-01 11:19:29 -04:00
6862eada65
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-08-01 11:19:29 -04:00
0bfd1c318c
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-08-01 11:19:28 -04:00
b6acfa491e
Update geoip and geoip6 to the July 4 2017 database.
2017-07-07 16:27:54 +02:00
24ee8595bf
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-06-09 09:58:45 -04:00
3913f959e3
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-06-09 09:58:45 -04:00
325c507a09
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-06-09 09:58:45 -04:00
104e8fa751
Update geoip and geoip6 to the June 8 2017 database.
2017-06-09 15:47:49 +02:00
71dd1d716a
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-05-08 08:07:11 -04:00
159ddf6dde
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-05-08 08:07:04 -04:00
68d6720452
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-05-08 08:06:59 -04:00
5207e41ffe
Update geoip and geoip6 to the May 2 2017 database.
2017-05-08 10:09:42 +02:00
44bc8821b1
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-04-06 08:31:23 -04:00
21d776738c
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-04-06 08:31:18 -04:00
a8a860e1da
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-04-06 08:31:12 -04:00
9d7933296c
Update geoip and geoip6 to the April 4 2017 database.
2017-04-06 10:52:39 +02:00
25c28bc2d9
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-03-08 10:11:05 -05:00
ecc73c3c03
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-03-08 10:10:44 -05:00
933a1e7997
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-03-08 10:10:29 -05:00
4488c319dd
Update geoip and geoip6 to the March 7 2017 database.
2017-03-08 09:41:35 +01:00
aec45bc0b1
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
2017-02-17 17:10:47 -05:00
43c18b1b7a
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-02-13 14:37:42 -05:00
124062e843
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-02-13 14:37:01 -05:00
f6016058b4
Update geoip and geoip6 to the February 8 2017 database.
2017-02-12 15:56:31 +01:00
e91bb84a91
Merge branch 'maint-0.2.6' into maint-0.2.7-redux
...
maint-0.2.7-redux is an attempt to try to re-create a plausible
maint-0.2.7 branch. I've started from the tor-0.2.7.6, and then I
merged maint-0.2.6 into the branch.
This has produced 2 conflicts: one related to the
rendcommon->rendcache move, and one to the authority refactoring.
2017-02-07 09:59:12 -05:00
54771bcaba
Merge branch 'maint-0.2.5' into maint-0.2.6
2017-01-11 09:12:21 -05:00
34fdd510ef
Merge branch 'maint-0.2.4' into maint-0.2.5
2017-01-11 09:11:58 -05:00
3833f67dd2
Update geoip and geoip6 to the January 4 2017 database.
2017-01-04 10:19:52 +01:00
3d9f8ff6a5
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-12-09 08:34:06 -05:00
3d2d3f2b62
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-12-09 08:33:57 -05:00
9db47e7921
Update geoip and geoip6 to the December 7 2016 database.
2016-12-09 10:23:36 +01:00
6c2174d44d
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-11-07 09:30:16 -05:00
db2571be61
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-11-07 09:29:54 -05:00
ea597832e2
Update geoip and geoip6 to the November 3 2016 database.
2016-11-07 15:05:19 +01:00
12a7298376
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-10-06 09:59:03 -04:00
304d8f3bbb
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-10-06 09:58:54 -04:00
1b4984f196
Update geoip and geoip6 to the October 6 2016 database.
2016-10-05 16:35:14 +02:00
52a99cb6c1
Merge branch 'maint-0.2.5' into maint-0.2.6
2016-09-07 13:53:53 -04:00
e4d82da05b
Merge branch 'maint-0.2.4' into maint-0.2.5
2016-09-07 13:53:43 -04:00
56f95ba94d
Update geoip and geoip6 to the September 6 2016 database.
2016-09-07 11:08:04 +02:00
Nick Mathewson
Karsten Loesing