d9508d8ede
Change copyright statement (with permission)
2018-11-06 15:42:18 -05:00
6b706bcf19
Remove a tab.
2018-11-06 15:41:32 -05:00
3c9dd9ef2d
Add parentheses to the ctassert macro expansions
2018-11-06 15:41:14 -05:00
e69a4ad6b3
Add a user of CTASSERT().
2018-11-06 15:39:58 -05:00
1a6060fa42
New macro CTASSERT(condition) to assert condition at compile-time.
...
To get it, use: #include "lib/cc/ctassert.h"
2018-11-06 15:36:58 -05:00
c8892b53ec
Merge remote-tracking branch 'tor-github/pr/466'
2018-11-06 15:35:45 -05:00
8020d6fb05
Merge remote-tracking branch 'tor-github/pr/464'
2018-11-06 15:33:25 -05:00
ba28704b29
Merge branch 'maint-0.3.5'
2018-11-06 15:22:11 -05:00
c60f3ea607
Merge remote-tracking branch 'tor-github/pr/474' into maint-0.3.5
2018-11-06 15:21:45 -05:00
bb9044381e
Merge branch 'maint-0.3.5'
2018-11-06 15:20:01 -05:00
8a5590ebac
Merge remote-tracking branch 'tor-github/pr/484' into maint-0.3.5
2018-11-06 15:19:04 -05:00
bcba6a4918
Merge branch 'maint-0.3.5'
2018-11-06 15:17:52 -05:00
67abf55d6b
Add a changes file for bug 28303
2018-11-06 15:17:19 -05:00
daaa2751ed
Include sys/time.h in timers.c and time_fmt.c
...
This fixes compilation on OpenBSD.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com >
2018-11-06 15:15:22 -05:00
3a2cb83685
refuse to start with relative paths + RunAsDaemon
...
Resume refusing to start with relative file paths and RunAsDaemon
set (regression from the fix for bug 22731).
Fixes bug 28298; bugfix on 0.3.3.1-alpha.
2018-11-06 15:50:56 +01:00
17d8ccefc0
Merge branch 'bug28348_036'
2018-11-06 09:18:01 -05:00
313b5b956c
Merge branch 'maint-0.3.5'
2018-11-06 09:16:25 -05:00
c32dab9e48
Merge branch 'bug28348_035' into bug28348_036
2018-11-06 07:43:27 -05:00
9431d35074
Merge branch 'bug28348_034' into bug28348_035
2018-11-06 07:42:55 -05:00
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
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
0d6d3e1f26
Notify systemd of ShutdownWaitLength
2018-11-05 11:46:28 +10:00
674ef53a7e
Add a warning if we can't write networkstatus-bridges
...
Fixes CID 1440818.
2018-11-02 13:32:43 -04:00
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
3e2423d19b
Update address tests to avoid offending coverity.
2018-11-02 13:29:24 -04:00
865514e66e
Merge branch 'ticket28100_squashed'
2018-11-02 13:19:24 -04:00
1b75de85b3
Don't overwrite the Content-Type when compressing
2018-11-02 13:19:14 -04:00
f0bd6c2c9d
Merge branch 'maint-0.3.5'
2018-11-02 13:14:37 -04:00
996f24fcd3
Merge branch 'bug27968_squashed' into maint-0.3.5
2018-11-02 13:14:32 -04:00
e36e4a9671
Sort the imports in test_rebind.py
...
Cleanup after #27968 .
2018-11-02 13:14:23 -04:00
a02d6c560d
Make test_rebind.py timeout when waiting for a log message
...
Closes #27968 .
2018-11-02 13:14:23 -04:00
cd674a10ad
Refactor test_rebind.py to consistently print FAIL on failure
...
Part of #27968 .
2018-11-02 13:14:23 -04:00
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
f27279f857
Merge remote-tracking branch 'tor-github/pr/449'
2018-11-02 13:11:26 -04:00
d671e3f513
Merge remote-tracking branch 'tor-github/pr/448'
2018-11-02 13:09:45 -04:00
3d8fcbcbad
Merge branch 'maint-0.3.5'
2018-11-02 13:02:02 -04:00
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
5acf6f8717
Bump to 0.3.4.9-dev
2018-11-02 13:01:32 -04:00
339ff694a7
Merge branch 'maint-0.3.5'
2018-11-02 11:29:00 -04:00
3c691613c6
forward-port 0.3.4.9 changelog and releasenotes
2018-11-02 11:28:57 -04:00
f57fd0318a
Merge remote-tracking branch 'tor-github/pr/397'
2018-11-02 10:01:26 -04:00
2ac24b503b
Merge branch 'maint-0.3.5'
2018-11-02 09:39:16 -04:00
a6c7e01584
Merge branch 'bug27963_wallclock' into maint-0.3.5
2018-11-02 09:39:13 -04:00
084a5a13c7
Merge branch 'bug27963_wallclock'
2018-11-02 09:38:26 -04:00
be197339ba
Merge branch 'maint-0.3.5'
2018-11-02 09:09:01 -04:00
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
d8d4fe83d0
Bump to 0.3.4.9
2018-11-02 09:08:45 -04:00
b71f93f532
Merge branch 'maint-0.3.5'
2018-11-02 09:06:38 -04:00
bbdf56aed6
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-02 09:06:38 -04:00
bfe8f50cc8
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-02 09:06:37 -04:00
Nick Mathewson
Taylor R Campbell
Kris Katterjohn
Roger Dingledine
teor
Alex Xu (Hello71)