35300 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
teor	72e4ed8634	Merge branch 'maint-0.4.3' into release-0.4.3	2020-04-09 11:03:37 +10:00
teor	2d6f00e45b	Merge branch 'maint-0.4.2' into maint-0.4.3	2020-04-09 11:03:34 +10:00
teor	2d7e08d57e	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-04-09 11:03:27 +10:00
teor	987f2fa50a	Merge branch 'maint-0.3.5' into maint-0.4.1	2020-04-09 11:03:20 +10:00
teor	d380acaeca	Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5	2020-04-09 11:02:49 +10:00
David Goulet	a985f554c4	Merge branch 'maint-0.4.3' into release-0.4.3	2020-04-08 09:42:13 -04:00
Mrigyen Sawant	34faee0600	Correct 'was not internal' to 'was internal' in test_external_ip()	2020-04-08 09:41:58 -04:00
teor	e8bbdc69d1	Merge branch 'maint-0.4.3' into release-0.4.3	2020-04-05 17:17:47 +10:00
teor	80a306c6e7	doc: Fix another man page typo ... The default value of the option is "auto", not "default".	2020-04-05 17:17:03 +10:00
teor	9385020620	Merge branch 'maint-0.4.3' into release-0.4.3	2020-04-05 17:12:07 +10:00
teor	613077229f	doc: Fix a typo in the man page ... "proceeding" means starting an action. "preceding" means the thing before this thing. In this context, it's a bit ambiguous.	2020-04-05 17:10:37 +10:00
teor	2b2e53b7fb	Merge branch 'maint-0.4.3' into release-0.4.3	2020-04-04 13:23:52 +10:00
teor	b1e1c6b505	changes: file for ticket 33782 ... Avoid conflicts between the fake sockets in tor's unit tests, and real file descriptors. Resolves issues running unit tests with GitHub Actions, where the process that embeds or launches the tests has already opened a large number of file descriptors. Fixes bug 33782; bugfix on 0.2.8.1-alpha. Found and fixed by Putta Khunchalee.	2020-04-04 13:20:06 +10:00
Putta Khunchalee	f43a841d94	Change starting file descriptor for tests.	2020-04-03 16:47:38 +07:00
teor	628a444242	Merge branch 'maint-0.4.3' into release-0.4.3	2020-04-03 14:44:30 +10:00
teor	7d2b6cacee	doc: Rewrite the approved-routers man page entry ... Obviously correct documentation changes.	2020-04-03 14:43:48 +10:00
teor	aa94f81add	Merge branch 'maint-0.4.3' into release-0.4.3	2020-04-01 23:03:47 +10:00
David Goulet	6c5c503a4c	configure: Fix enabled module variable expansion ... Fixes #33646 Signed-off-by: David Goulet <dgoulet@torproject.org>	2020-04-01 23:02:24 +10:00
David Goulet	7d6e9d7d95	Merge branch 'maint-0.4.3' into release-0.4.3	2020-03-30 13:38:57 -04:00
George Kadianakis	42e56f5bac	hs-v3: Relax severity of a log message when decoding descriptors. ... Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to ease debugging in the future.	2020-03-30 13:38:29 -04:00
David Goulet	78ac7c751c	Merge branch 'maint-0.4.3' into release-0.4.3	2020-03-26 09:15:00 -04:00
David Goulet	e472737297	Merge branch 'tor-github/pr/1794' into maint-0.4.3	2020-03-26 09:14:25 -04:00
Nick Mathewson	048714d2ce	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-03-25 10:56:27 -04:00
Nick Mathewson	0c7725be84	Merge branch 'maint-0.4.3' into release-0.4.3	2020-03-25 10:56:27 -04:00
Nick Mathewson	03b0d1840a	Merge branch 'maint-0.4.2' into maint-0.4.3	2020-03-25 10:56:27 -04:00
George Kadianakis	8f9c04ae73	Merge branch 'maint-0.4.3' into release-0.4.3	2020-03-23 16:57:27 +02:00
George Kadianakis	29420ab396	Merge branch 'tor-github/pr/1788' into maint-0.4.3	2020-03-23 16:56:59 +02:00
teor	52f61ec83e	Merge branch 'bug32588_042' into bug32588_043 ... Merge static function declaration deletions from bug32588_042 and maint-0.4.3 in app/config/config.c.	2020-03-21 04:01:00 +10:00
teor	5e2f31f177	Merge branch 'bug32588_041' into bug32588_042	2020-03-21 03:52:32 +10:00
teor	2962c32b7a	Merge branch 'bug32588_035' into bug32588_041 ... Merge tests from maint-0.4.1 with new tests from bug32588_035 in test_router.c.	2020-03-21 03:50:36 +10:00
Nick Mathewson	96ca14d989	Add a test for the localhost case.	2020-03-21 03:44:01 +10:00
Nick Mathewson	1251265a0f	Extend test to handle router_get_advertised_ipv6_or_ap	2020-03-21 03:43:58 +10:00
Nick Mathewson	1ba79d4567	Add a test for router_get_advertised_or_port_by_af().	2020-03-21 03:43:55 +10:00
Nick Mathewson	6ffe073db7	Add tests for get_first_advertised_{addr,port}_by_type_af()	2020-03-21 03:43:52 +10:00
teor	bac8bc0ff1	router: Refactor IPv6 ORPort function logic ... Return early when there is no suitable IPv6 ORPort. Show the address and port on error, using a convenience function. Code simplification and refactoring. Cleanup after 32588.	2020-03-21 03:43:48 +10:00
teor	861337fd6d	router: Stop advertising incorrect auto IPv6 ORPorts ... When IPv6 ORPorts are set to "auto", tor relays and bridges would advertise an incorrect port in their descriptor. This may be a low-severity memory safety issue, because the published port number may be derived from uninitialised or out-of-bounds memory reads. Fixes bug 32588; bugfix on 0.2.3.9-alpha.	2020-03-21 03:36:39 +10:00
Nick Mathewson	0db545b17a	Merge branch 'maint-0.4.3' into release-0.4.3	2020-03-20 08:06:53 -04:00
Nick Mathewson	e380396d42	Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3	2020-03-20 08:06:30 -04:00
Nick Mathewson	3913575acd	Merge branch 'maint-0.4.3' into release-0.4.3	2020-03-20 07:57:19 -04:00
teor	d4a74021e5	relay/dirauth: Set some output arguments in stubs ... And document how some functions set their output arguments. Fixes bug 33674; bugfix on 0.4.3.1-alpha.	2020-03-20 07:56:26 -04:00
Nick Mathewson	c478dc9b2f	Set *have_low_ports_out from stub port_parse_ports_relay(). ... Previously we just ignored this option, which would leave it unset, and cause an assertion failure later on when running with the User option. Fixes bug 33668; bugfix on 0.4.3.1-alpha.	2020-03-20 07:56:26 -04:00
teor	bb3df5f322	practracker: Disable practracker in git hooks ... Disable our coding standards best practices tracker in our git hooks. 0.4.3 branches only. Closes ticket 33678.	2020-03-20 17:32:57 +10:00
teor	23d0dba7ad	Merge branch 'maint-0.4.3' into release-0.4.3	2020-03-20 15:40:35 +10:00
teor	250b8499b8	dirauth: Remove a duplicate macro definition ... Obviously correct changes to already-reviewed code.	2020-03-20 15:39:55 +10:00
teor	26fd31fef8	Merge branch 'bug33673_035' into bug33673_041 ... Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.	2020-03-20 14:49:11 +10:00
teor	38e07b88fa	Appveyor: Copy required DLLs to test and app ... Copy required DLLs to test and app, before running tor's tests. This ensures that tor.exe and test*.exe use the correct version of each DLL. This fix is not required, but we hope it will avoid DLL search issues in future. Closes bug 33673; bugfix on 0.3.4.2-alpha.	2020-03-20 14:48:31 +10:00
teor	4225301444	Merge branch 'maint-0.4.3' into release-0.4.3	2020-03-20 11:25:01 +10:00
teor	eb2d08a72c	Merge branch 'maint-0.4.2' into maint-0.4.3	2020-03-20 11:24:57 +10:00
teor	3aa855dc68	Merge branch 'maint-0.4.1' into maint-0.4.2	2020-03-20 11:24:51 +10:00
Nick Mathewson	42ea03eb7f	Merge branch 'ticket33643_skip_035' into ticket33643_skip_041	2020-03-19 18:38:18 -04:00