33687 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
teor	b3478a8856	Merge branch 'maint-0.4.2'	2019-10-22 20:48:26 +10:00
teor	f98b59524c	Merge branch 'maint-0.4.1' into maint-0.4.2	2019-10-22 20:48:20 +10:00
teor	2318bb237f	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-10-22 20:48:13 +10:00
teor	9bb0ca122f	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-10-22 20:48:05 +10:00
teor	bed4390133	Merge remote-tracking branch 'origin/maint-0.3.5' into maint-0.3.5	2019-10-22 20:47:44 +10:00
teor	8f84999f58	Merge branch 'ticket32177_041' into ticket32177_042 ... Merge RUST_VERSION from maint-0.4.2 into disabled macOS rust build from ticket32177_041.	2019-10-22 19:44:58 +10:00
teor	86b1714731	Merge branch 'ticket32177_040' into ticket32177_041	2019-10-22 19:43:38 +10:00
teor	868bcc24e5	Merge branch 'ticket32177_035' into ticket32177_040	2019-10-22 19:43:33 +10:00
teor	8e0190d837	Merge branch 'maint-0.3.5' into ticket32177_035	2019-10-22 19:43:18 +10:00
teor	4c4a0d50ff	Travis: Disable the Rust macOS build ... This build was added in 0.3.5. We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177.	2019-10-22 19:42:45 +10:00
teor	92ad87b808	Merge branch 'ticket32177_029' into ticket32177_035 ... Stem from maint-0.3.5, disabled macOS chutney from ticket32177_029.	2019-10-22 19:42:23 +10:00
teor	511aeba8ee	Travis: Disable all but one macOS build ... We need to mitigate slow scheduling of Travis macOS jobs. Closes ticket 32177.	2019-10-22 19:35:43 +10:00
Nick Mathewson	b4e1dc747e	Merge remote-tracking branch 'tor-github/pr/1420'	2019-10-21 18:45:34 -04:00
Nick Mathewson	53aa159632	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-10-21 18:44:44 -04:00
Nick Mathewson	89ead08eef	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-10-21 18:44:44 -04:00
Nick Mathewson	7a35c8d8be	Merge branch 'maint-0.4.1' into maint-0.4.2	2019-10-21 18:44:44 -04:00
Nick Mathewson	65c0df4dbf	Merge branch 'maint-0.4.2'	2019-10-21 18:44:44 -04:00
Nick Mathewson	8378ad29e6	routermode.h: turn a comment into a doxygen comment.	2019-10-21 12:47:17 -04:00
Nick Mathewson	7dc78aca29	Merge remote-tracking branch 'tor-github/pr/1430'	2019-10-21 12:43:26 -04:00
teor	7a72e71f74	Merge remote-tracking branch 'tor-github/pr/1434'	2019-10-21 15:24:22 +10:00
teor	4fde7699ee	test/getinfo: Remove unnecessary test code ... Fix for 31684.	2019-10-21 14:21:41 +10:00
teor	92fa5239fc	control/getinfo: Use standard error handling ... Use BUG() for coding errors, and `< 0` for error checks. Fix to 31684.	2019-10-21 13:57:02 +10:00
teor	3b2525c375	Fix changes file and string typos ... Part of 31684.	2019-10-21 13:56:58 +10:00
AmreshVenugopal	6413b2102f	control: Add GETINFO support for dumping microdesc consensus ... - Allows control port to read microdesc consensus using: GETINFO dir/status-vote/microdesc/consensus add: Helper function `getinfo_helper_current_consensus` test: check if GETINFO commands return expected consensus data. Resolves 31684.	2019-10-21 13:54:55 +10:00
teor	77c85360f6	Merge branch 'maint-0.4.2'	2019-10-21 13:28:04 +10:00
teor	3539fdfd7a	Merge remote-tracking branch 'tor-github/pr/1168'	2019-10-21 13:09:48 +10:00
teor	04e9e74f1d	Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2	2019-10-21 13:07:39 +10:00
teor	a1f73cb93d	Merge branch 'maint-0.4.2'	2019-10-21 09:45:34 +10:00
teor	5dbdca0114	Merge remote-tracking branch 'tor-github/pr/1432' into maint-0.4.2	2019-10-21 09:45:18 +10:00
teor	5c8ecf364a	Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2	2019-10-21 09:44:42 +10:00
teor	042116e1fd	Merge branch 'maint-0.4.2'	2019-10-20 22:09:00 +10:00
teor	02e3e8eda5	hibernate: Fix repeated "bytes" in comment	2019-10-20 22:08:23 +10:00
teor	f420b60c19	Appveyor: Use Windows Server 2019 ... Instead of Windows Server 2016. Closes ticket 32086.	2019-10-20 22:04:08 +10:00
teor	475dffee42	dirauth: Add a macro comment to have_module_dirauth()	2019-10-20 20:26:12 +10:00
teor	b1f71eeed6	changes: file for 32123 ... Create an optional relay module, which can be disabled using the --disable-module-relay configure option. When it is set, also disable the dirauth module. Add a minimal implemention, which disables the relay and dircache modes in tor. Closes ticket 32123.	2019-10-20 20:26:09 +10:00
teor	0973575737	doc/HACKING: Update Module.md for the relay module ... Also fix some typos, and delete some obsolete instructions. Part of 32123.	2019-10-20 20:26:06 +10:00
teor	bf45b6cf0c	Travis: Add a --disable-module-relay job ... Part of 32123.	2019-10-20 20:26:02 +10:00
teor	b266a804e9	test/parseconf: Add basic dirauth and bridgeauth tests ... Part of 32123.	2019-10-20 20:25:58 +10:00
teor	0501ce9f13	test/parseconf: Expect different outputs when relay mode is disabled ... Part of 32123.	2019-10-20 20:25:54 +10:00
teor	cf2b00d3f5	test/rebind: Make control formatting and log parsing more robust ... * actually sleep when tor has not logged anything * log at debug level when waiting for tor to log something * backslash-replace bad UTF-8 characters in logs * format control messages as ASCII: tor does not accept UTF-8 control commands Fixes bug 31837; bugfix on 0.3.5.1-alpha.	2019-10-20 20:09:35 +10:00
teor	0a5ce8280c	err: Use the correct type for cb_buf ... Fixes bug 32060; bug not in any released version of tor. Resolves CID 1454761.	2019-10-20 20:01:56 +10:00
Roger Dingledine	aab5d90858	Merge branch 'maint-0.4.2'	2019-10-20 05:56:16 -04:00
Roger Dingledine	8b4d7447ae	fix easy typos	2019-10-20 05:52:32 -04:00
teor	012c44538c	test: Skip test scripts that require the relay module ... When tor is built without the relay module. Part of 32123.	2019-10-20 19:26:59 +10:00
teor	e2280d6f84	relay: Silence compiler warnings when relay mode is disabled ... Part of 32123.	2019-10-20 19:26:55 +10:00
teor	57e86a6d74	relay: Implement HAVE_MODULE_RELAY for routermode.c ... Part of 32123.	2019-10-20 19:26:48 +10:00
teor	7944b55ad1	feature: Move proxy_mode() into new files ... proxy_mode() was in routermode.[ch], but it's actually a client mode. Move it into client/proxymode.[ch]. Part of 32123.	2019-10-20 17:52:38 +10:00
teor	fdf47e0f0b	configure: Make --disable-module-relay imply --disable-module-dirauth ... Part of 32123.	2019-10-20 17:52:38 +10:00
teor	2e2e1ed765	configure: Add a relay module, with --disable-module-relay ... The Makefile and C defines don't actually do anything yet. Part of 32123.	2019-10-20 17:52:38 +10:00
Nick Mathewson	37320bce06	Merge branch 'maint-0.4.2'	2019-10-18 12:42:56 -04:00