26967 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	70b19894ae	Merge branch 'maint-0.3.2'	2017-12-04 13:23:52 -05:00
David Goulet	ff6c8cf861	sched: Downgrade warning log to info in KIST ... Some platforms don't have good monotonic time support so don't warn when the diff between the last run of the scheduler time and now is negative. The scheduler recovers properly from this so no need to be noisy. Fixes #23696 Signed-off-by: David Goulet <dgoulet@torproject.org>	2017-12-04 12:22:02 -05:00
Nick Mathewson	f50d64b62e	Merge branch 'bug23826-23828_squashed'	2017-12-04 11:43:11 -05:00
teor	a2c09f6751	Changes file for #23826, #23828, and #23870	2017-12-04 11:42:56 -05:00
teor	4b2995dc1d	Document the effects of AuthDirHasIPv6Connectivity ... Fixes #23870 on 0.2.4.1-alpha.	2017-12-04 11:42:56 -05:00
Nick Mathewson	b86c9acac3	Merge branch 'maint-0.3.1' into maint-0.3.2	2017-12-01 12:13:40 -05:00
Nick Mathewson	cf3da63b90	Merge branch 'maint-0.3.2'	2017-12-01 12:13:40 -05:00
Nick Mathewson	5c03bb7c0c	Merge branch 'maint-0.3.0' into maint-0.3.1	2017-12-01 12:13:40 -05:00
Nick Mathewson	3bca705c54	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-12-01 12:13:40 -05:00
Nick Mathewson	953a8f8510	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-12-01 12:13:40 -05:00
Nick Mathewson	f97f301b5b	Merge branch 'maint-0.2.5' into maint-0.2.8	2017-12-01 12:13:39 -05:00
Nick Mathewson	461e34bb3d	Fix a clang compilation warning in rendservice.c ... Fixes bug 24480; bugfix on 0.2.5.16.	2017-12-01 12:13:15 -05:00
Nick Mathewson	66e99096b3	Merge branch 'maint-0.3.2' ... "ours" merge to avoid version bump.	2017-12-01 09:35:36 -05:00
Nick Mathewson	909c91049a	Merge branch 'maint-0.3.1' into maint-0.3.2 ... "ours" merge to avoid version bump.	2017-12-01 09:35:31 -05:00
Nick Mathewson	7fae562a4d	Merge branch 'maint-0.3.0' into maint-0.3.1 ... "ours" merge to avoid version bump.	2017-12-01 09:35:25 -05:00
Nick Mathewson	6e3ec8222c	Merge branch 'maint-0.2.9' into maint-0.3.0 ... "ours" merge to avoid version bump.	2017-12-01 09:35:16 -05:00
Nick Mathewson	495db72c1e	Merge branch 'maint-0.2.8' into maint-0.2.9 ... "ours" merge to avoid version bump.	2017-12-01 09:35:07 -05:00
Nick Mathewson	dc3890439f	Merge branch 'maint-0.2.5' into maint-0.2.8 ... "ours" merge to avoid version bump.	2017-12-01 09:34:47 -05:00
Nick Mathewson	998a247123	bump to 0.3.2.6-alpha-dev	2017-12-01 09:34:31 -05:00
Nick Mathewson	a12dbbd882	bump to 0.3.1.9-dev	2017-12-01 09:34:20 -05:00
Nick Mathewson	1983068ba9	bump to 0.3.0.13-dev	2017-12-01 09:34:09 -05:00
Nick Mathewson	73869c99a0	bump to 0.2.9.14-dev	2017-12-01 09:34:00 -05:00
Nick Mathewson	8f858de819	bump to 0.2.8.17-dev	2017-12-01 09:33:51 -05:00
Nick Mathewson	162a087e5f	bump to 0.2.5.16-dev	2017-12-01 09:33:41 -05:00
Nick Mathewson	5fbb52d10f	forward-port changelogs and releasenotes	2017-12-01 09:16:15 -05:00
Nick Mathewson	699899cbff	remove changes files that are going into 0.3.2.6-alpha or earlier.	2017-11-30 12:31:23 -05:00
Nick Mathewson	ce4a381935	Merge branch 'maint-0.3.2' ... "ours" to avoid version bump.	2017-11-30 12:26:33 -05:00
Nick Mathewson	424ab08b5a	bump to 0.3.2.6-alpha	2017-11-30 12:26:30 -05:00
Nick Mathewson	9c89e8e435	Merge branch 'maint-0.3.1' into maint-0.3.2 ... "ours" to avoid version bumps	2017-11-30 12:25:53 -05:00
Nick Mathewson	4ebd436541	version bump to 0.3.1.9	2017-11-30 12:25:48 -05:00
Nick Mathewson	6b9c2ac23e	Merge branch 'maint-0.3.0' into maint-0.3.1 ... "ours" to avoid version bump.	2017-11-30 12:25:07 -05:00
Nick Mathewson	f2ecdeb724	version bump to 0.3.0.13	2017-11-30 12:25:01 -05:00
Nick Mathewson	8f36104574	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-11-30 12:24:13 -05:00
Nick Mathewson	16c9cfd658	version bump to 0.2.9.14	2017-11-30 12:24:07 -05:00
Nick Mathewson	1fd6e25522	Merge branch 'maint-0.2.8' into maint-0.2.9 ... "ours" merge to avoid version bump.	2017-11-30 12:22:38 -05:00
Nick Mathewson	6ee4472544	version bump to 0.2.8.17	2017-11-30 12:22:32 -05:00
Nick Mathewson	2e219291be	Merge branch 'maint-0.2.5' into maint-0.2.8 ... "ours" to avoid version bump	2017-11-30 12:21:36 -05:00
Nick Mathewson	6bda6777c1	bump to 0.2.5.16	2017-11-30 12:19:48 -05:00
Nick Mathewson	cef844d017	Merge branch 'maint-0.3.2'	2017-11-30 12:07:59 -05:00
Nick Mathewson	fd73a168ca	Merge branch 'maint-0.3.1' into maint-0.3.2	2017-11-30 12:07:59 -05:00
Nick Mathewson	ee48eb1eb5	Merge branch 'maint-0.3.0' into maint-0.3.1	2017-11-30 12:07:59 -05:00
Nick Mathewson	5fc0587c04	Merge branch 'maint-0.2.9' into maint-0.3.0	2017-11-30 12:07:59 -05:00
Nick Mathewson	7e2b012b46	Merge branch 'maint-0.2.8' into maint-0.2.9	2017-11-30 12:07:59 -05:00
Nick Mathewson	ba4a9cf0c0	Merge branch 'maint-0.2.5' into maint-0.2.8	2017-11-30 12:07:59 -05:00
Nick Mathewson	d459c08b7d	Merge branch 'trove-2017-012_030' into maint-0.3.0	2017-11-30 12:07:43 -05:00
Nick Mathewson	52d7af631c	Merge branch 'trove-2017-010_029' into maint-0.2.9	2017-11-30 12:07:26 -05:00
Nick Mathewson	f49876d66e	Merge branch 'trove-2017-012_025' into maint-0.2.5	2017-11-30 12:06:21 -05:00
Nick Mathewson	08ce39fb0f	Merge branch 'trove-2017-011_025' into maint-0.2.5	2017-11-30 12:06:17 -05:00
Nick Mathewson	a6a0c7a4ec	Merge branch 'trove-2017-009_025' into maint-0.2.5	2017-11-30 12:05:59 -05:00
Nick Mathewson	75509dc827	Fix changes file	2017-11-30 11:52:40 -05:00