8512 Commits

Author	SHA1	Message	Date
Nick Mathewson	78bcfc1280	circpad_setup_machine_on_circ(): exit early on error. ... This function does a nonfatal assertion to make sure that a machine is not registered twice, but Tobias Pulls found a case where it happens. Instead, make the function exit early so that it doesn't cause a remotely triggered memory leak. Fixes bug 33619; bugfix on 0.4.0.1-alpha. This is also tracked as TROVE-2020-004.	2020-03-16 17:59:57 -04:00
Nick Mathewson	b2e543bfe7	Merge branch 'maint-0.3.5' into maint-0.4.1	2020-03-13 16:46:16 -04:00
Nick Mathewson	b9d71f3848	Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5	2020-03-13 16:46:09 -04:00
teor	c96cf14943	Merge branch 'bug33195_035' into bug33195_041 ... Conflicts: * Keep TOR_TEST_RNG_SEED from maint-0.4.1 * Keep the ordering from bug33195_035	2020-02-13 13:55:55 +10:00
teor	add387c507	Travis: Sort jobs in order of speed ... Putting the slowest jobs first takes full advantage of Travis concurrency. Closes 33194.	2020-02-13 13:52:41 +10:00
teor	fc3555100f	Travis: Remove a redundant distcheck job ... Part of 33194.	2020-02-13 13:45:18 +10:00
teor	03650e0f60	Travis: Require the macOS IPv6 chutney job ... The job was previously set to fast_finish / allow_failure, to speed up the build. Closes ticket 33195.	2020-02-13 13:43:59 +10:00
teor	5298113da9	Merge branch 'maint-0.3.5' into maint-0.4.1	2020-02-12 12:21:57 +10:00
Alexander Færøy	b9c7c61ea5	Lowercase the BridgeDistribution value from torrc in descriptors. ... This patch ensures that we always lowercase the BridgeDistribution from torrc in descriptors before submitting it. See: https://bugs.torproject.org/32753	2020-02-12 12:21:41 +10:00
teor	88723ad169	Merge remote-tracking branch 'tor-github/pr/1689' into maint-0.3.5	2020-02-12 12:18:59 +10:00
Nick Mathewson	71c49f7356	Merge branch 'maint-0.4.0' into maint-0.4.1	2020-02-10 14:17:10 -05:00
Nick Mathewson	f3fa22bf1b	Merge branch 'maint-0.3.5' into maint-0.4.0	2020-02-10 14:17:09 -05:00
Nick Mathewson	99d044d553	Fix a Rust compilation warning; resolve bug 33212.	2020-02-10 13:32:09 -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	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	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	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
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
teor	46057ec5ae	Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0	2019-12-05 10:13:15 +10:00
teor	aee966cb06	Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5	2019-12-05 10:11:18 +10:00
teor	14089a29b5	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-12-03 12:46:50 +10:00
teor	febbc236d4	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-12-03 12:46:43 +10:00
teor	145ff92d92	Merge branch 'maint-0.2.9' into maint-0.3.5 ... Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5.	2019-12-03 12:45:41 +10:00
teor	792c15fde2	Travis: use -std=gnu99 in some jobs ... Require C99 standards-conforming code in Travis CI, but allow GNU gcc extensions. Also activates clang's -Wtypedef-redefinition warnings. Builds some jobs with -std=gnu99, and some jobs without. Closes ticket 32500.	2019-12-03 12:42:39 +10:00