623 commits

Author	SHA1	Message	Date
Nick Mathewson	8c91cbb6ca	Merge branch 'maint-0.2.6' into maint-0.2.7	2017-01-11 09:12:51 -05:00
Nick Mathewson	54771bcaba	Merge branch 'maint-0.2.5' into maint-0.2.6	2017-01-11 09:12:21 -05:00
Nick Mathewson	34fdd510ef	Merge branch 'maint-0.2.4' into maint-0.2.5	2017-01-11 09:11:58 -05:00
Karsten Loesing	3833f67dd2	Update geoip and geoip6 to the January 4 2017 database.	2017-01-04 10:19:52 +01:00
Nick Mathewson	adaf6a422a	Merge branch 'maint-0.2.8' into maint-0.2.9	2016-12-09 08:34:24 -05:00
Nick Mathewson	b49369badd	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-12-09 08:34:12 -05:00
Nick Mathewson	3d9f8ff6a5	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-12-09 08:34:06 -05:00
Nick Mathewson	3d2d3f2b62	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-12-09 08:33:57 -05:00
Karsten Loesing	9db47e7921	Update geoip and geoip6 to the December 7 2016 database.	2016-12-09 10:23:36 +01:00
Nick Mathewson	e4ef9f7491	In torrc.sample.in, note that bandwidth must be >=75 KB. ... Queue a corresponding change for torrc.minimal.in. Closes ticket 20085.	2016-11-08 19:23:49 -05:00
Nick Mathewson	e4b793fe41	Merge branch 'maint-0.2.8' into maint-0.2.9	2016-11-07 09:32:00 -05:00
Nick Mathewson	f5fdf188b9	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-11-07 09:30:42 -05:00
Nick Mathewson	6c2174d44d	Merge branch 'maint-0.2.5' into maint-0.2.6	2016-11-07 09:30:16 -05:00
Nick Mathewson	db2571be61	Merge branch 'maint-0.2.4' into maint-0.2.5	2016-11-07 09:29:54 -05:00
Karsten Loesing	ea597832e2	Update geoip and geoip6 to the November 3 2016 database.	2016-11-07 15:05:19 +01:00
Nick Mathewson	7410adb330	Merge branch 'maint-0.2.8'	2016-10-06 09:59:49 -04:00
Nick Mathewson	ec718aa839	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-10-06 09:59:18 -04:00
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	c897328fee	Merge remote-tracking branch 'samdney/ticket19209'	2016-09-12 08:58:04 -04:00
Carolin Zöbelein	87b91949f1	Add some clarifications in the comments. Bug 19209	2016-09-11 01:30:02 +02:00
Nick Mathewson	f028434a5f	Merge branch 'maint-0.2.8'	2016-09-07 13:54:21 -04:00
Nick Mathewson	11edbf4808	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-09-07 13:54:03 -04: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	a7e317927b	Merge branch 'maint-0.2.8'	2016-08-12 10:27:23 -04:00
Nick Mathewson	db372addc8	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-08-12 10:27:08 -04: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
Roger Dingledine	81cc31d3fa	three typo fixes i found in my sandbox	2016-07-25 20:17:35 -04:00
Nick Mathewson	a31078a581	Merge branch 'maint-0.2.8'	2016-07-19 12:34:37 +02:00
Nick Mathewson	4d70ed7be0	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-07-19 12:32:14 +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	6a7d11f38a	Merge branch 'maint-0.2.8'	2016-06-13 10:49:24 -04:00
Nick Mathewson	80089c9e7c	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-06-13 10:48:56 -04: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	7fa11a92d5	Merge branch 'maint-0.2.8'	2016-05-09 14:59:47 -04:00
Nick Mathewson	7fe80c2905	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-05-09 14:56:56 -04: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	7532cd439b	When we get a bad nickname, explain what a good one is. ... Closes #18300; patch from "icanhasaccount".	2016-04-07 10:54:53 -04:00
Nick Mathewson	ad4ff7a5b9	Merge branch 'maint-0.2.6' into maint-0.2.7	2016-04-07 10:45:46 -04:00