34660 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nick Mathewson	92a6803e1d	Distribute checkSpaceTest.sh and run it when we have perl.	2019-12-03 12:56:53 +10:00
Nick Mathewson	8a10a74870	Have checkSpaceTest.sh exit as skipped when on Windows ... Managing line-ending issues for this one isn't worth it.	2019-12-03 12:56:50 +10:00
Nick Mathewson	bd61a4e848	Add a simple test for checkSpace.pl ... This script is not expected to work on windows due to line-ending issues, so I'm not making it get run on an automated basis. We should use it when editing checkSpace.pl. Closes ticket 32613.	2019-12-03 12:56:46 +10:00
teor	a4c22164c0	Merge branch 'maint-0.4.2'	2019-12-03 12:47:05 +10:00
teor	3207a8e5c2	Merge branch 'maint-0.4.1' into maint-0.4.2	2019-12-03 12:46:58 +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	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
Nick Mathewson	f63cf2158b	Merge branch 'ticket32207'	2019-12-02 11:41:40 -05:00
Nick Mathewson	af7416bfad	Link to mainloop_pubsub.[ch] when describing delivery policies	2019-12-02 11:41:16 -05:00
George Kadianakis	53bdd21179	Merge branch 'tor-github/pr/1559'	2019-12-02 12:52:44 +02:00
teor	a58a9572fa	Travis: Set pipefail	2019-12-02 11:58:54 +10:00
teor	4a157c7569	Merge branch 'ticket32629_041' into ticket32629_042 ... Merge RUST_VERSION from maint-0.4.2 with disabling the macOS Rust job from ticket32629_041.	2019-12-01 20:28:44 +10:00
teor	a00b9e5a86	Merge branch 'ticket32629_040' into ticket32629_041	2019-12-01 20:26:55 +10:00
teor	349554f40d	Merge branch 'ticket32629_035' into ticket32629_040	2019-12-01 20:26:51 +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	96e620caaf	Merge remote-tracking branch 'tor-github/pr/1574'	2019-12-01 17:53:06 +10:00
teor	41a3930129	control: Update an outdated function comment ... Cleanup after 31531.	2019-11-29 10:55:27 +10:00
teor	f8f278f8c4	control: Remove an unused function return value ... Cleanup after 31531.	2019-11-29 10:54:42 +10:00
teor	7a69b3aebc	control: Rename a function variable ... Cleanup after 31531.	2019-11-29 10:53:32 +10:00
teor	7572988ea9	control: Remove an unnecessary header in control_events.h ... And replace it with a struct forward declaration. Also, move all the headers in the file before the forward declaration. Cleanup after 31531.	2019-11-29 10:50:09 +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
George Kadianakis	68a00c4951	Merge branch 'tor-github/pr/1573'	2019-11-27 15:36:26 +02:00
David Goulet	85b984dbc6	hs: Add changes file for 32020 ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-11-27 14:52:09 +02:00
David Goulet	c508513014	test: Add unit tests for closing intro circ on failure ... Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-11-27 14:52:09 +02:00
David Goulet	a423cec670	hs-v3: Remove unused hs_service_intro_circ_has_closed() ... Since the removal of ip->circuit_established, this function does litterally nothing so clean it up. Part of #32020 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-11-27 14:52:09 +02:00
David Goulet	cbc495453c	hs-v3: Give a cleanup type to hs_circ_cleanup() ... By centralizing the circuit cleanup type that is: on close, free and repurpose, some actions on the circuit can not happen for a certain cleanup type or for all types. This passes a cleanup type so the HS subsystem (v2 and v3) can take actions based on the type of cleanup. For instance, there is slow code that we do not run on a circuit close but rather only on free. Part of #32020 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-11-27 14:52:09 +02:00
David Goulet	7f83c43594	hs-v3: Note client intro circuit failure ... Report back to the v3 subsystem any introduction point client circuit failure so they can be noted down in the failure cache. Fixes #32020 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-11-27 14:52:09 +02:00
David Goulet	1aafe3376e	hs-v2: Modernize rend_client_circuit_cleanup() code ... Old and messy code path. Structure it in a more pleasant and readable way. No behavior change with this refactor. Part of #32020 Signed-off-by: David Goulet <dgoulet@torproject.org>	2019-11-27 14:52:09 +02:00
Neel Chauhan	99cf3f99c0	Make control_event_conf_changed() take a config_line_t	2019-11-26 22:12:23 -05:00
Neel Chauhan	96a15bece7	If statements to getresuid() and getresgid() in setuid.c shouldn't have an extra space	2019-11-26 21:58:31 -05:00
Nick Mathewson	2aaa7ae6e2	checkSpace.pl: make output more uniform. ... There were lots of slight differences in indentation and formatting among the in-file error messages.	2019-11-26 12:58:25 -05:00
teor	fadd292bf0	practracker/includes.py: Don't read editor temp files ... (Or any files that start with "." or "#".) Obviously correct changes to already-reviewed code.	2019-11-26 17:52:18 +10:00
teor	3669a2f827	Merge remote-tracking branch 'tor-github/pr/1564'	2019-11-26 11:30:49 +10:00
teor	c7baacf4c0	Makefile: Fix more targets for out-of-tree builds ... Support callgraph and rectify-includes in out-of-tree builds. Part of 32522.	2019-11-26 11:04:02 +10:00
teor	5ec4fb7558	crypt_ops: Fix some weird macro spacing	2019-11-26 11:03:22 +10:00
teor	e66fde45f1	Code Style: Remove double newlines in win32/orconfig.h ... There's no reason for them to be in there. Part of 32522.	2019-11-26 11:02:58 +10:00
teor	0ce11433c0	check-spaces: Fix an outdated comment	2019-11-26 11:02:28 +10:00
teor	d7fdab49f7	test/controller: Stop including a ".c" source file ... Part of 32522.	2019-11-26 11:02:05 +10:00
teor	ab70c315bd	practracker: Fix a typo in a logging function call ... Obviously correct changes to already-reviewed code.	2019-11-26 11:01:34 +10:00
teor	2a71a58d4f	test: Fix a python double-space	2019-11-26 11:00:39 +10:00
Nick Mathewson	031f204a10	configure: reject Python 2. ... Python 2 will be end-of-life as of 1 Jan 2020, so we can finally stop supporting it. As a first step, we should make our configure script stop accepting python 2 as something acceptable to run our tests with. Closes ticket 32608.	2019-11-25 13:01:04 -05:00
Nick Mathewson	31f8b4fa65	Merge branch 'stream-socks-auth' into bug19859_merged	2019-11-25 07:58:02 -05:00
teor	68b6d85248	Merge branch 'maint-0.4.2' ... Merge tor_free() notes with whitespace fixes.	2019-11-25 12:52:10 +10:00
teor	eb81704081	CodingStandards: Use consistent spacing ... * 2 newlines before ====== headers * 1 newline before ------ headers	2019-11-25 12:50:15 +10:00
teor	03867b3dd7	Merge branch 'maint-0.4.2'	2019-11-25 12:37:26 +10:00