Nick Mathewson
a1d5341374
Merge branch 'bug32175'
2019-10-22 07:51:30 -04:00
Nick Mathewson
65e80ce646
Merge branch 'from_setconf_removal_squashed'
2019-10-22 07:50:42 -04:00
Nick Mathewson
0bb2e77283
changes file for 31999
2019-10-22 07:50:13 -04:00
teor
b3478a8856
Merge branch 'maint-0.4.2'
2019-10-22 20:48:26 +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
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
7a35c8d8be
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-21 18:44:44 -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
65c0df4dbf
Merge branch 'maint-0.4.2'
2019-10-21 18:44:44 -04:00
Nick Mathewson
b064e0420a
Changes file for 32175 (test_options.c cleanup)
2019-10-21 14:46:04 -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
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
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
5c8ecf364a
Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.4.2
2019-10-21 09:44:42 +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
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
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
Nick Mathewson
37320bce06
Merge branch 'maint-0.4.2'
2019-10-18 12:42:56 -04:00
Nick Mathewson
f0f3f3338e
Merge remote-tracking branch 'tor-github/pr/1427' into maint-0.4.2
2019-10-18 12:42:49 -04:00
Nick Mathewson
264c5312eb
Merge branch 'maint-0.4.2'
2019-10-18 12:32:49 -04:00
Nick Mathewson
0994050c4a
Merge remote-tracking branch 'tor-github/pr/1426' into maint-0.4.2
2019-10-18 12:32:29 -04:00
Nick Mathewson
7c5716d162
Merge branch 'maint-0.4.2'
2019-10-18 12:27:49 -04:00
Nick Mathewson
57c4af16f0
Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.2
2019-10-18 12:27:39 -04:00
Nick Mathewson
fbd2fef220
Merge branch 'maint-0.4.2' of git-rw.torproject.org:/tor into maint-0.4.2
2019-10-18 12:25:55 -04:00
teor
b3fc3b609b
changes: file for 32124.
2019-10-18 17:26:09 +10:00
teor
d616214e47
Merge branch 'maint-0.4.2'
2019-10-18 12:05:20 +10:00
teor
f73c8bd786
Merge remote-tracking branch 'tor-github/pr/1407' into maint-0.4.2
2019-10-18 12:05:07 +10:00
Alexander Færøy
389b37246e
Remove overly strict assertions in transports.c.
...
This patch removes an overly strict tor_assert() and an ignorable BUG()
expression. Both of these would trigger if a PT was unable to configure
itself during startup. The easy way to trigger this is to configure an
obfs4 bridge where you make the obfs4 process try to bind on a port
number under 1024.
See: https://bugs.torproject.org/31091
2019-10-17 21:33:54 +02:00
Alexander Færøy
85b4a5c276
Handle errors from execve() in the Unix process backend more gracefully.
...
This patch removes a call to tor_assert_unreached() after execve()
failed. This assertion leads to the child process emitting a stack trace
on its standard output, which makes the error harder for the user to
demystify, since they think it is an internal error in Tor instead of
"just" being a "no such file or directory" error.
The process will now instead output "Error from child process: X" where
X is the stringified version of the errno value.
See: https://bugs.torproject.org/31810
2019-10-17 20:52:22 +02:00
Nick Mathewson
800b823c29
Merge branch 'cmdline_refactor'
2019-10-17 12:01:45 -04:00
Nick Mathewson
35c18870b4
add a changes file for 32003 (command-line option parsing).
2019-10-17 12:01:40 -04:00
David Goulet
4a8d491322
mainloop: Disable periodic events before a destroy
...
When tearing down all periodic events during shutdown, disable them first so
their enable flag is updated.
This allows the tor_api.h to relaunch tor properly after a clean shutdown.
Fixes #32058
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-17 10:11:32 -04:00
Nick Mathewson
0081d6c112
Merge branch 'ticket31373_042_01_squashed'
2019-10-17 10:09:16 -04:00
David Goulet
7fcf999c63
Print summary at the end of the configure script
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-17 10:08:34 -04:00
teor
5f3233ce1a
Merge branch 'maint-0.4.2'
2019-10-17 14:52:19 +10:00
teor
e483257e1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-17 14:51:58 +10:00
teor
92c4dc9b14
Merge remote-tracking branch 'tor-github/pr/1373' into maint-0.4.2
2019-10-17 14:51:30 +10:00
teor
13daf339a9
Merge remote-tracking branch 'tor-github/pr/1372' into maint-0.4.1
2019-10-17 14:51:02 +10:00
teor
702aa8f775
Merge remote-tracking branch 'tor-github/pr/1370' into maint-0.3.5
2019-10-17 14:50:28 +10:00
teor
c660f47960
Merge remote-tracking branch 'tor-github/pr/1369' into maint-0.2.9
2019-10-17 14:49:52 +10:00
Nick Mathewson
2c97cf3add
Merge remote-tracking branch 'tor-github/pr/1329'
2019-10-16 12:31:47 -04:00
