Nick Mathewson
313b5b956c
Merge branch 'maint-0.3.5'
2018-11-06 09:16:25 -05:00
Nick Mathewson
c32dab9e48
Merge branch 'bug28348_035' into bug28348_036
2018-11-06 07:43:27 -05:00
Nick Mathewson
9431d35074
Merge branch 'bug28348_034' into bug28348_035
2018-11-06 07:42:55 -05:00
Nick Mathewson
2aff02eb3d
Actually disable NEED_NET periodic events when DisableNetwork is set
...
Fixes bug 28348; bugfix on 0.3.4.1-alpha
2018-11-06 07:40:02 -05:00
Nick Mathewson
adecda7539
changes file for subsystems api (28330)
2018-11-05 09:42:16 -05:00
Nick Mathewson
32b23a4c40
Make tortls use the subsystems interface
...
This one only needs a shutdown right now.
2018-11-05 09:22:02 -05:00
Nick Mathewson
019a044e5e
Turn "compress" into a subsystem.
2018-11-05 09:22:02 -05:00
Nick Mathewson
207253df8d
Move monotonic time setup into a subsystem
2018-11-05 09:22:02 -05:00
Nick Mathewson
cad61f0f6d
Move prefork, postfork, and thread-exit hooks into subsys
...
So far, crypto is the only module that uses them, but others are
likely to do so in the future.
2018-11-05 09:22:02 -05:00
Nick Mathewson
50436ccea4
Add crypto module as a subsystem.
2018-11-05 09:22:02 -05:00
Nick Mathewson
cfe5b35edb
Move networking startup/cleanup logic into a subsystem.
2018-11-05 09:22:02 -05:00
Nick Mathewson
05b54f6a6a
Use subsystems manager for subsystems used in tests.
2018-11-05 09:22:02 -05:00
Nick Mathewson
a0ee54549f
Turn the wallclock module into a subsystem.
...
(This may be slightly gratuitous.)
2018-11-05 09:22:02 -05:00
Nick Mathewson
d3e4afcc9b
Turn the logging code into a subsystem
2018-11-05 09:22:02 -05:00
Nick Mathewson
b8c50eabfe
Add a subsystem for our threading support
2018-11-05 09:22:02 -05:00
Nick Mathewson
178c1821b2
Make the windows process parameter initialization a subsystem
...
Also, move it from "main" into lib/process
2018-11-05 09:22:02 -05:00
Nick Mathewson
175153a329
Make initialization for the "err" library into a subsystem.
2018-11-05 09:22:02 -05:00
Nick Mathewson
6e7ff8cba0
Move the code that knows our tor version into a lowest-level lib
2018-11-05 09:22:02 -05:00
Nick Mathewson
7bb76b24cf
Code to manage the list of subsystems.
2018-11-05 09:22:02 -05:00
Neel Chauhan
45b28167d7
In count_acceptable_nodes(), count direct and indirect nodes with node_has_preferred_descriptor()
2018-11-05 08:26:02 -05:00
teor
368aeaadff
Appveyor: Add Windows Server 2016 to tor's build matrix
...
Build tor on Windows Server 2012 R2 and Windows Server 2016 using
Appveyor's CI.
Closes ticket 28318.
2018-11-05 16:21:58 +10:00
teor
bd0e38dcfe
systemd: allow tor some time to shut down after ShutdownWaitLength expires
...
This commit upstreams the Debian package setting of 60 seconds for
TimeoutStopSec, but applies it to startup and shutdown.
Part of 28113.
2018-11-05 11:49:19 +10:00
Alex Xu (Hello71)
0d6d3e1f26
Notify systemd of ShutdownWaitLength
2018-11-05 11:46:28 +10:00
Nick Mathewson
674ef53a7e
Add a warning if we can't write networkstatus-bridges
...
Fixes CID 1440818.
2018-11-02 13:32:43 -04:00
Nick Mathewson
18a4eaf5c1
Avoid mmap leak if we get a consensus diff we can't use.
...
Fixes CID 1440819; bug not in any released Tor.
2018-11-02 13:30:55 -04:00
Nick Mathewson
3e2423d19b
Update address tests to avoid offending coverity.
2018-11-02 13:29:24 -04:00
Nick Mathewson
865514e66e
Merge branch 'ticket28100_squashed'
2018-11-02 13:19:24 -04:00
Alex Xu (Hello71)
1b75de85b3
Don't overwrite the Content-Type when compressing
2018-11-02 13:19:14 -04:00
Nick Mathewson
f0bd6c2c9d
Merge branch 'maint-0.3.5'
2018-11-02 13:14:37 -04:00
Nick Mathewson
996f24fcd3
Merge branch 'bug27968_squashed' into maint-0.3.5
2018-11-02 13:14:32 -04:00
teor
e36e4a9671
Sort the imports in test_rebind.py
...
Cleanup after #27968 .
2018-11-02 13:14:23 -04:00
teor
a02d6c560d
Make test_rebind.py timeout when waiting for a log message
...
Closes #27968 .
2018-11-02 13:14:23 -04:00
teor
cd674a10ad
Refactor test_rebind.py to consistently print FAIL on failure
...
Part of #27968 .
2018-11-02 13:14:23 -04:00
teor
8f43b8fb47
Avoid a race condition in test_rebind.py
...
If tor terminates due to SIGNAL HALT before test_rebind.py calls
tor_process.terminate(), an OSError 3 (no such process) is thrown.
Fixes part of bug 27968 on 0.3.5.1-alpha.
2018-11-02 13:14:23 -04:00
Nick Mathewson
f27279f857
Merge remote-tracking branch 'tor-github/pr/449'
2018-11-02 13:11:26 -04:00
Nick Mathewson
d671e3f513
Merge remote-tracking branch 'tor-github/pr/448'
2018-11-02 13:09:45 -04:00
Nick Mathewson
3d8fcbcbad
Merge branch 'maint-0.3.5'
2018-11-02 13:02:02 -04:00
Nick Mathewson
0ea508ec6f
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" merge to avoid version bump.
2018-11-02 13:01:53 -04:00
Nick Mathewson
5acf6f8717
Bump to 0.3.4.9-dev
2018-11-02 13:01:32 -04:00
Nick Mathewson
339ff694a7
Merge branch 'maint-0.3.5'
2018-11-02 11:29:00 -04:00
Nick Mathewson
3c691613c6
forward-port 0.3.4.9 changelog and releasenotes
2018-11-02 11:28:57 -04:00
Nick Mathewson
f57fd0318a
Merge remote-tracking branch 'tor-github/pr/397'
2018-11-02 10:01:26 -04:00
Nick Mathewson
2ac24b503b
Merge branch 'maint-0.3.5'
2018-11-02 09:39:16 -04:00
Nick Mathewson
a6c7e01584
Merge branch 'bug27963_wallclock' into maint-0.3.5
2018-11-02 09:39:13 -04:00
Nick Mathewson
084a5a13c7
Merge branch 'bug27963_wallclock'
2018-11-02 09:38:26 -04:00
Nick Mathewson
be197339ba
Merge branch 'maint-0.3.5'
2018-11-02 09:09:01 -04:00
Nick Mathewson
ff05162710
Merge branch 'maint-0.3.4' into maint-0.3.5
...
"ours" to avoid version bump.
2018-11-02 09:08:53 -04:00
Nick Mathewson
d8d4fe83d0
Bump to 0.3.4.9
2018-11-02 09:08:45 -04:00
Nick Mathewson
b71f93f532
Merge branch 'maint-0.3.5'
2018-11-02 09:06:38 -04:00
Nick Mathewson
bbdf56aed6
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-02 09:06:38 -04:00
