George Kadianakis
17daab76b8
Add onion service activity information to our heartbeat logs.
2018-01-23 12:31:06 +02:00
Roger Dingledine
48a51c5f8b
oxford comma for-the-win
2018-01-19 18:42:53 -05:00
Nick Mathewson
ef148638a1
Add a "falls through" comment to make gcc happy.
2018-01-19 17:29:36 -05:00
Nick Mathewson
1bcbb1bb0b
Merge remote-tracking branch 'mikeperry/bug23101-mergeready-squashed'
2018-01-19 17:28:10 -05:00
Mike Perry
489628a7e4
Bug 23101: Pre-build HS-specific circuits (instead of general).
...
Prebuilt circs are 4 hops, since only server side HSDIR and intro circs
are 3 hops, and it is OK if those sometimes take longer to build.
2018-01-19 22:21:49 +00:00
Mike Perry
86ee771c28
Add new circuit purposes for hsdir activity.
...
This lets us control their path len and usage.
2018-01-19 22:21:48 +00:00
Mike Perry
20a3f61105
Implement layer 2 and layer 3 guard pinning via torrc.
...
Block circuit canibalization when HSRendezvousMiddleNodes is active.
Also make it apply to all HS circuits, not just rends.
2018-01-19 22:21:48 +00:00
Nick Mathewson
edd427a8ba
Merge branch 'disable_signal_handlers'
2018-01-19 16:35:24 -05:00
Nick Mathewson
df4d5ebb7d
Merge branch 'maint-0.3.2'
2018-01-19 16:30:53 -05:00
Nick Mathewson
129456e222
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-19 16:30:50 -05:00
Nick Mathewson
de3cf40fa6
Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2
2018-01-19 16:30:44 -05:00
Nick Mathewson
7f2e23e7ac
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid maint-0.3.0's version of 24895.
2018-01-19 16:30:12 -05:00
Nick Mathewson
00a42277ea
Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1
2018-01-19 16:30:02 -05:00
Nick Mathewson
b39c50cde8
Merge branch 'maint-0.2.9' into maint-0.3.0
...
Conflicts:
src/or/rendservice.c
2018-01-19 16:29:43 -05:00
Nick Mathewson
a2aaf9509b
Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9
2018-01-19 16:29:15 -05:00
David Goulet
f870f9c8bc
Merge branch 'bug24895_031_02' into bug24895_032_02
2018-01-19 16:26:26 -05:00
David Goulet
f98f7ca898
Merge branch 'bug24895_029_02' into bug24895_031_02
2018-01-19 16:21:55 -05:00
Roger Dingledine
490ae26b24
hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2
2018-01-19 16:13:54 -05:00
Nick Mathewson
fa6137a903
Merge branch 'maint-0.3.2'
2018-01-19 10:18:59 -05:00
Nick Mathewson
63e549a6b4
Merge remote-tracking branch 'tlyu-github/travis-workaround-master'
2018-01-19 10:18:55 -05:00
Nick Mathewson
9652c65fa3
Merge branch 'maint-0.3.1'
...
"ours" merge to avoid the 0.3.1 version of the 24863 fix.
2018-01-19 10:18:35 -05:00
Nick Mathewson
e2aacf100f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-19 10:18:29 -05:00
Nick Mathewson
483a59ec2a
Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1
2018-01-19 10:18:21 -05:00
Nick Mathewson
9b19e33bed
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid 0.2.5 version of #24863 fix.
2018-01-19 10:17:33 -05:00
Nick Mathewson
1cf11b6940
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-19 10:17:05 -05:00
Nick Mathewson
36567c5ca4
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-01-19 10:16:47 -05:00
Nick Mathewson
65a27d95e7
Improve documentation for signal code
2018-01-19 10:02:20 -05:00
Nick Mathewson
2c9e0a286c
Merge branch 'restart_debug_squashed'
2018-01-19 09:52:14 -05:00
Nick Mathewson
97d9ba2380
Add a mostly disabled feature to debug restarting in-process
...
For 23847, we want Tor to be able to shut down and then restart in
the same process. Here's a patch to make the Tor binary do that.
To test it, you need to build with --enable-restart-debugging, and
then you need to set the environment variable TOR_DEBUG_RESTART.
With this option, Tor will then run for 5 seconds, then restart
itself in-process without exiting. This only happens once.
You can change the 5-second interval using
TOR_DEBUG_RESTART_AFTER_SECONDS.
Implements ticket 24583.
2018-01-19 09:52:05 -05:00
Nick Mathewson
e7907f15f9
Don't call Libevent's event_base_free() on NULL.
...
It doesn't crash, but it produces a warning.
Fixes bug 24933; bugfix on 322abc030e
. Bug
not in any released Tor.
2018-01-19 09:45:10 -05:00
Roger Dingledine
cc5a9e9667
turn MAX_REND_FAILURES into a function
...
no actual changes in behavior
2018-01-19 02:38:07 -05:00
Roger Dingledine
a15eb9ff43
MAX_REND_FAILURES is 1, but we would try three times
...
Fix an "off by 2" error in counting rendezvous failures on the onion
service side.
While we thought we would stop the rendezvous attempt after one failed
circuit, we were actually making three circuit attempts before giving up.
Fixes bug 24895; bugfix on 0.0.6.
2018-01-19 02:28:55 -05:00
Nick Mathewson
44388757c4
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-18 08:13:48 -05:00
Nick Mathewson
c8a27d89b2
Merge branch 'maint-0.3.2'
2018-01-18 08:13:48 -05:00
Nick Mathewson
f406b9df05
Merge branch 'bug24826_031' into maint-0.3.1
2018-01-18 08:13:45 -05:00
Taylor Yu
3bf9174fa3
Work around Travis CI ptrace regression
...
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly. Set "sudo: required" to force non-container builds for
clang and work around this.
2018-01-17 14:16:21 -06:00
Taylor Yu
0e7f1b06e9
Work around Travis CI ptrace regression
...
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly. Set "sudo: required" to force non-container builds for
clang and work around this.
2018-01-17 14:10:04 -06:00
Taylor Yu
49de586add
Work around Travis CI ptrace regression
...
Travis CI deployed a change that disables ptrace capabilities in
container builds, which prevents LeakSanitizer on clang from working
properly. Set "sudo: required" to force non-container builds for
clang and work around this.
2018-01-17 13:40:34 -06:00
Nick Mathewson
77026f8a87
Merge branch 'bug22798_029_squashed'
2018-01-17 13:26:41 -05:00
Nick Mathewson
959af20247
Merge branch 'maint-0.3.2'
2018-01-17 11:13:18 -05:00
Nick Mathewson
4e653ac2ca
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-17 11:12:15 -05:00
Nick Mathewson
86aa7f0a3f
Merge branch 'maint-0.3.2'
2018-01-17 10:50:58 -05:00
Nick Mathewson
f02c6bcad0
Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2
2018-01-17 10:49:45 -05:00
Nick Mathewson
57eab23ea5
update comment; ignore argument on non-win
2018-01-17 10:40:00 -05:00
Nick Mathewson
1efb84215e
Improve Windows performance with SIO_IDEAL_SEND_BACKLOG_QUERY.
...
Patch written by "Vort" on trac. Addresses ticket 22798.
2018-01-17 10:40:00 -05:00
Nick Mathewson
60dfdd9b15
Merge branch 'bug21074_029'
2018-01-17 09:07:50 -05:00
Nick Mathewson
0bfd5a6597
Add a cast to avoid a signed/unsigned comparison
2018-01-17 09:06:32 -05:00
Nick Mathewson
5970836af8
fix a check-changes warning
2018-01-16 14:41:43 -05:00
Nick Mathewson
454d854363
Merge branch 'bug21074_029'
2018-01-16 14:13:39 -05:00
Nick Mathewson
f470756cf4
Merge branch 'maint-0.3.2'
2018-01-16 13:36:48 -05:00