33890 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	c5e610af05	Merge branch 'maint-0.4.1' into maint-0.4.2 ... Using "ours" strategy to avoid version bump	2020-01-30 11:19:23 -05:00
Nick Mathewson	49cffee635	bump to 0.4.2.6-dev	2020-01-30 11:19:16 -05:00
Nick Mathewson	7afb95d3e3	Bump to 0.4.1.8-dev	2020-01-30 11:18:50 -05:00
Nick Mathewson	f470b863a0	Bump version to 0.4.2.6	2020-01-29 19:44:29 -05:00
Nick Mathewson	0fb407591b	Merge branch 'maint-0.4.1' into maint-0.4.2 ... "Ours" merge to avoid version bump.	2020-01-29 19:42:43 -05:00
Nick Mathewson	ec7f99e6ef	bump to 0.4.1.8	2020-01-29 19:42:24 -05:00
teor	7b6be02a92	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-01-30 07:55:12 +10: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	48187248d3	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-01-16 10:00:47 +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
teor	7e111d0eaa	practracker: print a notice to stderr when disabled ... When TOR_DISABLE_PRACTRACKER is set, print a message to stderr when skipping practracker checks. Part of 32705.	2020-01-14 17:41:00 +10:00
Nick Mathewson	6b1592b564	test_practracker.sh: never disable practracker ... When practracker is disabled, its output will be empty. We don't want that happening during our tests. Fixes bug 32705; bugfix on 0.4.2.1-alpha, when test_practracker.sh was introduced.	2020-01-13 16:17:51 -05:00
Nick Mathewson	6da989cfe8	Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2	2020-01-06 13:20:57 -05: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	2d8d6d1ebf	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-01-06 08:08:59 -05:00
Nick Mathewson	f5461a4bdf	update changes file to pass "make check-changes"	2020-01-06 08:08:48 -05:00
Nick Mathewson	16e94dc7a7	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-01-06 08:06:54 -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	5dbb607e94	Merge branch 'maint-0.4.1' into maint-0.4.2	2019-12-20 10:12:51 +10: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
Nick Mathewson	b4977d1aa9	Fix formatting in tor_assertf() message in struct_check_magic(). ... Closes 32771; bugfix on 0.4.2.1-alpha.	2019-12-16 15:31:23 -05:00
Nick Mathewson	df5c81fec0	Merge branch 'bug32765_041' into bug32771_042	2019-12-16 15:27:18 -05:00
Nick Mathewson	1b619a627c	Use CHECK_PRINTF() for printf-like functions in util_bug.h	2019-12-16 15:14:13 -05:00
teor	8b5c11fbf6	Merge branch 'bug32240_32242_041' into bug32240_32242_042	2019-12-16 09:23:46 +10:00
teor	84c4ede052	Merge branch 'bug32240_32242_040' into bug32240_32242_041	2019-12-16 09:23:41 +10: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	da404910a7	Merge branch 'bug32240_041' into bug32240_042 ... Merge: * CHUTNEY_TOR_SANDBOX=0 from bug32240_041 * RUST_VERSION from maint-0.4.2	2019-12-16 09:15:42 +10:00
teor	4a34fd5b74	Merge branch 'bug32240_040' into bug32240_041	2019-12-16 09:14:38 +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	bd11fb1096	Merge branch 'maint-0.4.1' into maint-0.4.2	2019-12-16 08:16:20 +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