33026 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	1a375c3b19	Merge branch 'trove_2020_002_035' into trove_2020_002_041 ... Resolved Conflicts: src/feature/dirparse/parsecommon.c	2020-02-05 12:06:24 -05:00
Nick Mathewson	d0bce65ce2	changes file for 33119 aka TROVE-2020-002	2020-02-05 12:02:32 -05:00
Nick Mathewson	f160212ee8	When parsing tokens, reject early on spurious keys.	2020-02-05 11:57:31 -05:00
Nick Mathewson	9e1085c924	When parsing, reject >1024-bit RSA private keys sooner. ... Private-key validation is fairly expensive for long keys in openssl, so we need to avoid it sooner.	2020-02-05 11:11:35 -05:00
Nick Mathewson	7afb95d3e3	Bump to 0.4.1.8-dev	2020-01-30 11:18:50 -05:00
Nick Mathewson	ec7f99e6ef	bump to 0.4.1.8	2020-01-29 19:42:24 -05:00
teor	6b392c333a	Merge branch 'maint-0.4.0' into maint-0.4.1	2020-01-30 07:55:05 +10:00
teor	65825018c7	Merge branch 'maint-0.3.5' into maint-0.4.0	2020-01-30 07:54:58 +10:00
teor	9b0b2aef80	Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1	2020-01-30 07:54:39 +10:00
teor	41d52e9cd8	Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5	2020-01-30 07:53:53 +10:00
Nick Mathewson	1f163fcbde	Change BUG() messages in buf_flush_to_tls() to IF_BUG_ONCE() ... We introduced these BUG() checks in b0ddaac074 to prevent a recurrence of bug 23690. But there's a report of the BUG() message getting triggered and filling up the disk. Let's change it to IF_BUG_ONCE(). Fixes bug 33093; bugfix on 0.3.2.2-alpha.	2020-01-29 08:31:22 -05:00
teor	9d771ccc86	Travis: Stop allowing stem test failures ... Stop allowing failures on the Travis CI stem tests job. It looks like all the stem hangs we were seeing are now fixed, but let's make sure we see them if they happen again. Closes ticket 33075.	2020-01-28 19:56:56 +10:00
teor	fb541ffca3	Merge branch 'maint-0.4.0' into maint-0.4.1	2020-01-16 10:00:40 +10:00
teor	026f068bb3	Merge branch 'maint-0.3.5' into maint-0.4.0	2020-01-16 10:00:32 +10:00
teor	19954cffd7	Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5	2020-01-16 09:57:27 +10:00
Nick Mathewson	54eec5342d	Initialize publish/subscribe code when running as an NT service. ... Fixes bug 32778; bugfix on 0.4.1.1-alpha.	2020-01-06 09:22:57 -05:00
Nick Mathewson	f5461a4bdf	update changes file to pass "make check-changes"	2020-01-06 08:08:48 -05:00
Peter Gerber	b9d81282e0	Fix sandbox crash during reload of logging configuration ... Allow calls to dup() which was introduced in commit a22fbab986. From a security perspective, I don't think this should impact the security of the sandbox significantly. As far as I can tell, there is nothing an adversary can do with a duplicated FD that can't be done with the original.	2020-01-05 15:24:45 +00:00
teor	7237637871	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-12-20 10:12:43 +10:00
Peter Gerber	0d64bafcfe	Correct how we use libseccomp ... This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1.	2019-12-17 09:47:28 -05:00
teor	d96b35d663	Merge branch 'bug32240_32242_035' into bug32240_32242_040 ... Merge: * libzstd-dev from ticket32242_035 * shellcheck from maint-0.4.0	2019-12-16 09:22:52 +10:00
teor	0b3763612c	Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035	2019-12-16 09:21:05 +10:00
teor	e2f78396f4	Merge branch 'bug32240_035' into bug32240_040	2019-12-16 09:14:32 +10:00
teor	75096de4c7	Merge branch 'bug32240_029' into bug32240_035 ... Merge * Chutney Trusty deletion in bug32240_029 * NSS addition in maint-0.3.5	2019-12-16 09:09:16 +10:00
teor	37b04aeed7	changes: file for 32240	2019-12-16 09:06:25 +10:00
teor	0f07d25243	Travis: Run Chutney jobs in Ubuntu Bionic images ... Closes 32240.	2019-12-16 09:03:48 +10:00
teor	704f3224a2	Travis: Turn off Tor's Sandbox in Chutney jobs ... We need to set "Sandbox 0", until we fix sandbox errors that are triggered by Ubuntu Xenial and Bionic. See 32722. Part of 32240.	2019-12-16 09:01:45 +10:00
teor	ffccf6fc55	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-12-16 08:16:12 +10:00
teor	7481172983	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-12-16 08:16:04 +10:00
teor	1cd20ff848	Merge branch 'maint-0.2.9' into maint-0.3.5	2019-12-16 08:15:55 +10:00
teor	05908d57f6	Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5	2019-12-16 08:14:04 +10:00
teor	7dd5946094	Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9	2019-12-16 08:13:38 +10:00
Nick Mathewson	7174a80edd	bump to 0.4.1.7-dev	2019-12-09 16:02:36 -05:00
Nick Mathewson	7aaf714e8e	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-12-09 16:02:07 -05:00
Nick Mathewson	b9504f788c	Bump version to 0.4.0.6-dev	2019-12-09 16:01:56 -05:00
Nick Mathewson	651d29c0f7	Merge branch 'maint-0.3.5' into maint-0.4.0 ... "ours" to avoid version bump.	2019-12-09 16:01:22 -05:00
Nick Mathewson	0c4f0ec977	bump to 0.3.5.9-dev	2019-12-09 16:01:11 -05:00
Nick Mathewson	6513102b9d	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-12-06 16:02:08 -05:00
Nick Mathewson	c7ca3fc186	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-12-06 16:02:07 -05:00
Nick Mathewson	74cae547e5	Merge branch 'maint-0.2.9' into maint-0.3.5	2019-12-06 16:02:07 -05:00
Karsten Loesing	b7b467d3af	Update geoip and geoip6 to the December 3 2019 database.	2019-12-06 11:50:35 +01:00
teor	a277f28947	changes: file for 32629	2019-12-06 10:51:43 +10:00
teor	b84e7715da	changes: file for 32629	2019-12-06 10:51:05 +10:00
Nick Mathewson	8933c7908d	bump version to 0.4.1.7	2019-12-05 13:31:46 -05:00
Nick Mathewson	db1065403d	Merge branch 'maint-0.4.0' into maint-0.4.1 ... "ours" to avoid version bump.	2019-12-05 13:31:17 -05:00
Nick Mathewson	e66533befa	Bump to 0.4.0.6	2019-12-05 13:31:01 -05:00
Nick Mathewson	371d7dbc1a	Merge branch 'maint-0.3.5' into maint-0.4.0 ... "ours" to avoid version bump.	2019-12-05 13:30:32 -05:00
Nick Mathewson	c53567c36f	Bump version to 0.3.5.9	2019-12-05 13:29:49 -05:00
teor	cfa9cc34aa	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-12-05 10:14:01 +10:00
teor	92fb099067	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-12-05 10:13:53 +10:00