31146 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	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
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	2b6df3da21	Merge branch 'bug33212_035' into maint-0.3.5	2020-02-10 14:17:03 -05:00
Nick Mathewson	99d044d553	Fix a Rust compilation warning; resolve bug 33212.	2020-02-10 13:32:09 -05: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	19954cffd7	Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5	2020-01-16 09:57:27 +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	0b3763612c	Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035	2019-12-16 09:21:05 +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	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	0c4f0ec977	bump to 0.3.5.9-dev	2019-12-09 16:01:11 -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	c53567c36f	Bump version to 0.3.5.9	2019-12-05 13:29:49 -05: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	62cf12a8bd	Travis: use -std=gnu99 with NSS, and clang with Chutney ... NSS: * test NSS-specific code with -std=gnu99 * use a recent gcc version from the latest Ubuntu image Chutney: * use clang, so we keep one clang Linux job * keep clang on a fast job, so the overall build finishes quickly Closes ticket 32500 for 0.3.5.	2019-12-03 12:46:22 +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
teor	6558bb4460	Travis: Disable the macOS Rust job ... This time, we're disabling it because it's the lowest priority job. (And also slow.) Part of 32629.	2019-12-01 20:25:00 +10:00
teor	f2f7491cd9	Merge branch 'ticket32629_029' into ticket32629_035 ... Merge re-enable chutney from ticket32629_029 with stem from maint-0.3.5.	2019-11-28 12:21:08 +10:00
teor	453e092e52	Revert "Travis: Disable the Rust macOS build" ... This reverts commit 4c4a0d50ff.	2019-11-28 12:11:37 +10:00
teor	99b5f1b261	Revert "Travis: Disable all but one macOS build" ... This reverts commit 511aeba8ee.	2019-11-28 12:10:10 +10:00
teor	501b5174d8	Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5	2019-11-25 12:35:11 +10:00
teor	400cee261e	Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5	2019-11-25 12:34:29 +10:00
teor	54c01119ed	Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5	2019-11-25 12:33:55 +10:00
teor	83424cb62f	Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5	2019-11-25 12:33:14 +10:00
teor	f9812ee5f7	Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5	2019-11-25 12:29:43 +10:00
Nick Mathewson	7beaaed245	Merge branch 'maint-0.2.9' into maint-0.3.5	2019-11-11 10:14:03 -05:00
teor	2abff832dd	Appveyor: Install OpenSSL to resolve a header/library mismatch ... Install the mingw OpenSSL package in Appveyor. This makes sure that the OpenSSL headers and libraries match in Tor's Appveyor builds. (This bug was triggered by an Appveyor image update.) Fixes bug 32449; bugfix on 0.3.5.6-rc.	2019-11-11 13:19:15 +10:00
Karsten Loesing	853b6ad095	Update geoip and geoip6 to the November 6 2019 database.	2019-11-09 10:10:19 +01:00
Nick Mathewson	4d70e725d1	Do not try to shut down the event loop when it is not initialized. ... Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a configuration that failed during the options_act() stage. Fixes bug 32407; bugfix on 0.3.3.1-alpha.	2019-11-06 11:33:23 -05:00
teor	1bde356bf6	Merge branch 'maint-0.2.9' into maint-0.3.5	2019-11-06 11:19:30 +10:00
teor	4abfcb7997	Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5	2019-11-06 11:18:09 +10:00
teor	0e2834a371	Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5	2019-11-06 11:17:43 +10:00
teor	d2e4262ebc	Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5	2019-11-06 11:17:01 +10:00
teor	6bfdd09679	Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5	2019-11-06 11:16:09 +10:00
teor	0650bf3695	Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9	2019-11-06 11:15:45 +10:00