ef3ec11a5b
Begin work on an 0.3.5.4-alpha changelog
2018-11-07 14:46:33 -05:00
f229c4e66a
Bump to 0.3.5.4-alpha
2018-11-07 14:40:26 -05:00
aea2b04467
Merge remote-tracking branch 'teor/ticket28318-035' into maint-0.3.5
2018-11-07 11:16:52 -05:00
c60f3ea607
Merge remote-tracking branch 'tor-github/pr/474' into maint-0.3.5
2018-11-06 15:21:45 -05:00
8a5590ebac
Merge remote-tracking branch 'tor-github/pr/484' into maint-0.3.5
2018-11-06 15:19:04 -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
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
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
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
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
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
3c691613c6
forward-port 0.3.4.9 changelog and releasenotes
2018-11-02 11:28:57 -04:00
a6c7e01584
Merge branch 'bug27963_wallclock' into maint-0.3.5
2018-11-02 09:39:13 -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
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
6bd069630a
Merge branch 'bug26470_032' into maint-0.3.3
2018-11-02 09:06:32 -04:00
a3fc93b8dd
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-02 09:05:18 -04:00
f288f2478a
Merge branch 'bug26896_034' into maint-0.3.4
2018-11-02 09:05:14 -04:00
d409565e38
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-11-02 09:04:25 -04:00
8ed4f1ee84
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-11-02 09:04:25 -04:00
e847909b71
Merge remote-tracking branch 'dgoulet/ticket27410_032_01' into maint-0.3.3
2018-11-02 09:04:20 -04:00
0d124488f8
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-10-31 11:02:58 -04:00
158db532eb
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-31 11:01:41 -04:00
bcc1a71808
Merge branch 'maint-0.2.9' into maint-0.3.3
2018-10-31 11:01:40 -04:00
0a824bd889
Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9
2018-10-31 11:01:36 -04:00
488969fe9c
Merge branch 'tor-github/pr/438' into maint-0.3.5
2018-10-30 11:43:54 -04:00
95559279e1
Merge branch 'tor-github/pr/415' into maint-0.3.5
2018-10-30 11:36:36 -04:00
6c9d678ff6
hs-v3: Add changes file for 28026
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-10-30 11:28:53 -04:00
d023de945a
tweak manpage bits about v3 onion svc client auth
...
make a couple things more explicit, like not needing to set "HiddenServiceAuthorizeClient" & etc
2018-10-30 11:25:24 -04:00
9b72dca953
Add changes file for Bug #28127
2018-10-30 10:49:03 -04:00
cd9914d9f9
Add test for HiddenServiceAuthorizeClient and v3 onion services
2018-10-30 10:49:03 -04:00
82b3a02302
Detect the onion service version and then check for invalid options unless we have set HiddenServiceVersion
2018-10-30 10:48:56 -04:00
3a05b5acdc
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-10-30 09:35:11 -04:00
97324a731f
Merge remote-tracking branch 'tor-github/pr/431' into maint-0.3.5
2018-10-30 09:35:07 -04:00
cf2cb783b7
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-10-30 09:34:04 -04:00
038bc21f88
Merge remote-tracking branch 'tor-github/pr/346' into maint-0.3.3
2018-10-30 09:33:36 -04:00
ee1cc0feae
Add a changes file for Alex Crichton's rust fixes.
2018-10-30 08:45:37 -04:00
262b0fe7a0
Merge remote-tracking branch 'tor-github/pr/381' into maint-0.3.5
2018-10-30 08:39:57 -04:00
709cd447f0
Merge branch '27913_rebased_035' into maint-0.3.5
2018-10-29 15:59:06 -04:00
Nick Mathewson
Kris Katterjohn
Roger Dingledine
teor
Alex Xu (Hello71)
David Goulet
Mike Tigas
Neel Chauhan