427 Commits

Author	SHA1	Message	Date
Nick Mathewson	12a7298376	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-10-06 09:59:03 -04:00
Nick Mathewson	304d8f3bbb	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-10-06 09:58:54 -04:00
Karsten Loesing	1b4984f196	Update geoip and geoip6 to the October 6 2016 database.	2016-10-05 16:35:14 +02:00
Nick Mathewson	52a99cb6c1	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-09-07 13:53:53 -04:00
Nick Mathewson	e4d82da05b	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-09-07 13:53:43 -04:00
Karsten Loesing	56f95ba94d	Update geoip and geoip6 to the September 6 2016 database.	2016-09-07 11:08:04 +02:00
Nick Mathewson	742ff2cddb	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-08-12 10:27:01 -04:00
Nick Mathewson	46754d6081	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-08-12 10:26:48 -04:00
Karsten Loesing	1410947351	Update geoip and geoip6 to the August 2 2016 database.	2016-08-12 11:53:38 +02:00
Nick Mathewson	210928f66a	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-07-19 12:31:54 +02:00
Nick Mathewson	d95c2809b3	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-07-19 12:31:20 +02:00
Karsten Loesing	79939c6f11	Update geoip and geoip6 to the July 6 2016 database.	2016-07-18 08:40:22 +02:00
Nick Mathewson	b4bb88606e	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-06-13 10:48:48 -04:00
Nick Mathewson	f25f7b759c	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-06-13 10:48:35 -04:00
Karsten Loesing	c14c662758	Update geoip and geoip6 to the June 7 2016 database.	2016-06-12 11:35:50 +02:00
Nick Mathewson	0b477bfd55	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-05-09 14:55:45 -04:00
Nick Mathewson	368146370b	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-05-09 14:55:22 -04:00
Karsten Loesing	3c2d4611ce	Update geoip and geoip6 to the May 4 2016 database.	2016-05-09 17:51:15 +02:00
Nick Mathewson	2ce99b9f48	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-04-07 10:45:38 -04:00
Nick Mathewson	34a51d1621	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-04-07 10:45:32 -04:00
Karsten Loesing	97c6e717b9	Update geoip and geoip6 to the April 5 2016 database.	2016-04-07 11:10:09 +02:00
Nick Mathewson	443dddb749	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-03-09 10:36:35 -05:00
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	44ad3be221	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-02-05 08:13:24 -05: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	400df18688	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-01-07 09:14:05 -08: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	089ee13534	Merge branch 'maint-0.2.5' into maint-0.2.6	2015-12-07 10:10:44 -05: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	552136668c	Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6	2015-10-09 10:14:46 -04: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	fb5a858a35	Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6	2015-09-24 10:06:15 -04: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	9d86f6665a	Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6	2015-07-29 10:48:13 -04: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	418b6f8197	Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6	2015-06-25 11:43:17 -04: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	0ac748353a	Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6	2015-04-27 14:18:16 -04: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