390 commits

Author	SHA1	Message	Date
Nick Mathewson	21f9829e79	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-03-09 10:36:20 -05:00
Karsten Loesing	8e2640b15a	Update geoip and geoip6 to the March 3 2016 database.	2016-03-04 10:56:51 +01:00
Nick Mathewson	f06d9a9cef	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-02-05 08:13:13 -05:00
Karsten Loesing	d5ac79e056	Update geoip and geoip6 to the February 2 2016 database.	2016-02-04 08:53:24 +01:00
Nick Mathewson	ae223138fb	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-01-07 09:13:54 -08:00
Karsten Loesing	1496056c12	Update geoip and geoip6 to the January 5 2016 database.	2016-01-07 11:10:37 +01:00
Nick Mathewson	e8e89fd7a1	Merge branch 'maint-0.2.4' into maint-0.2.5	2015-12-07 10:10:21 -05:00
Karsten Loesing	dbb919cf94	Update geoip and geoip6 to the December 1 2015 database.	2015-12-05 17:02:59 +01:00
Nick Mathewson	3569cffe14	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2015-10-09 10:12:59 -04:00
Karsten Loesing	62b02a1941	Update geoip and geoip6 to the October 9 2015 database.	2015-10-09 15:27:55 +02:00
Nick Mathewson	809217e6f3	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2015-09-24 10:06:00 -04:00
Karsten Loesing	8b3e0b7729	Update geoip and geoip6 to the September 3 2015 database.	2015-09-24 15:08:15 +02:00
Nick Mathewson	01bb260f31	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2015-07-29 10:47:07 -04:00
Karsten Loesing	7004d67430	Update geoip and geoip6 to the July 8 2015 database.	2015-07-29 15:49:04 +02:00
Nick Mathewson	fd082c394b	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2015-06-25 11:43:04 -04:00
Nick Mathewson	fde4199e1c	Merge remote-tracking branch 'karsten/geoip6-jun2015' into maint-0.2.4	2015-06-25 11:42:47 -04:00
Nick Mathewson	cb8c5c023f	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2015-06-25 11:42:31 -04:00
Karsten Loesing	08e14e1448	Update geoip6 to the June 3 2015 database.	2015-06-09 16:28:48 +02:00
Karsten Loesing	e5907e94c2	Update geoip to the June 3 2015 database.	2015-06-09 16:26:10 +02:00
Nick Mathewson	6c7720ed49	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2015-04-27 14:16:55 -04:00
Nick Mathewson	efae1bcef6	Merge remote-tracking branch 'karsten/geoip6-apr2015' into maint-0.2.4	2015-04-27 14:15:58 -04:00
Nick Mathewson	609cdec112	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2015-04-27 14:15:44 -04:00
Karsten Loesing	b5f6495876	Update geoip6 to the April 8 2015 database.	2015-04-24 17:51:36 +02:00
Karsten Loesing	bcc0a48cfe	Update geoip to the April 8 2015 database.	2015-04-24 17:49:45 +02:00
Nick Mathewson	306f2f0eff	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2015-03-09 16:24:44 -04:00
Nick Mathewson	220e9be095	Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4	2015-03-09 16:24:07 -04:00
Nick Mathewson	5588e677bd	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2015-03-09 16:23:55 -04:00
Karsten Loesing	62714068d9	Update geoip6 to the March 3 2015 database.	2015-03-09 21:11:52 +01:00
Karsten Loesing	beda8d2934	Update geoip to the March 3 2015 database.	2015-03-09 21:09:44 +01:00
Nick Mathewson	7cbdec578b	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2015-01-23 08:52:55 -05:00
Nick Mathewson	df4c484021	Merge remote-tracking branch 'karsten/geoip6-jan2015' into maint-0.2.4	2015-01-23 08:52:35 -05:00
Nick Mathewson	dbd5a9a8f9	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2015-01-23 08:52:20 -05:00
Karsten Loesing	a9ce0cd659	Update geoip6 to the January 7 2015 database.	2015-01-22 09:58:29 +01:00
Karsten Loesing	c3f8f5ab0e	Update geoip to the January 7 2015 database.	2015-01-22 09:56:54 +01:00
Nick Mathewson	5b55778c86	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2014-11-24 09:19:06 -05:00
Nick Mathewson	137982f955	Merge remote-tracking branch 'karsten/geoip6-nov2014' into maint-0.2.4	2014-11-24 09:18:36 -05:00
Nick Mathewson	8d5f1e6961	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2014-11-24 09:18:21 -05:00
Karsten Loesing	5441c733e0	Update geoip6 to the November 15 2014 database.	2014-11-24 14:23:18 +01:00
Karsten Loesing	8611c6bccd	Update geoip to the November 15 2014 database.	2014-11-24 14:21:31 +01:00
Nick Mathewson	fa7ce6d3be	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2014-08-13 12:52:40 -04:00
Nick Mathewson	b45f0f8fb9	Merge remote-tracking branch 'karsten/geoip6-aug2014' into maint-0.2.4	2014-08-13 12:51:38 -04:00
Nick Mathewson	244ca67e47	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2014-08-13 12:51:27 -04:00
Karsten Loesing	6235b4769d	Update geoip6 to the August 7 2014 database.	2014-08-13 16:16:11 +02:00
Karsten Loesing	b98e3f9936	Update geoip to the August 7 2014 database.	2014-08-13 16:08:33 +02:00
Nick Mathewson	e0aa88d106	Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5	2014-07-21 14:30:09 -04:00
Nick Mathewson	75501dbe4a	Merge remote-tracking branch 'karsten/geoip6-jul2014' into maint-0.2.4	2014-07-21 14:29:43 -04:00
Nick Mathewson	015f710f72	Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4	2014-07-21 14:29:30 -04:00
Karsten Loesing	6345dfa1fe	Update geoip6 to the July 10 2014 database.	2014-07-18 16:31:25 +02:00
Karsten Loesing	6d5efbef22	Update geoip to the July 10 2014 database.	2014-07-18 16:28:50 +02:00
Nick Mathewson	173a1afc58	Merge remote-tracking branch 'origin/maint-0.2.4'	2014-06-10 21:09:27 -04:00