Nick Mathewson
fd8ee1d7c3
Merge branch 'maint-0.3.2'
2018-01-24 12:09:07 -05:00
Nick Mathewson
6ba2881aec
Fix a memory leak in scheduler/loop_kist
...
Fixes bug 25005.
2018-01-24 12:07:45 -05:00
Nick Mathewson
6f4ee6e5e7
Merge remote-tracking branch 'mikeperry/bug24946'
2018-01-23 14:08:47 -05:00
George Kadianakis
17daab76b8
Add onion service activity information to our heartbeat logs.
2018-01-23 12:31:06 +02:00
Mike Perry
db5b670d85
Bug 24946: Fix a warning message caused by a missed purpose check.
...
Also fix three other checks (found by inspection of all
CIRCUIT_PURPOSE_C_GENERAL occurrences).
2018-01-20 03:18:31 +00: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
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
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
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
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
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
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
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
Nick Mathewson
0cb89eb828
Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2
2018-01-16 13:35:52 -05:00
Nick Mathewson
4bb831e087
Improve fragile-hardening performance of consensus_split_lines.
...
For whatever reason, in my testing, using memchr() here improves
performance over strchr() by a great deal.
Fixes bug 24826; bugfix on 0.3.1.1-alpha.
2018-01-16 12:42:40 -05:00
Roger Dingledine
af8cadf3a9
Remove false positives from channel_is_client()
...
Fix a set of false positives where relays would consider connections
to other relays as being client-only connections (and thus e.g.
deserving different link padding schemes) if those relays fell out
of the consensus briefly.
Now we look only at the initial handshake and whether the connection
authenticated as a relay.
Fixes bug 24898; bugfix on 0.3.1.1-alpha.
2018-01-15 22:33:40 -05:00
Roger Dingledine
7ce335c921
v3 onion services now obey MAX_REND_FAILURES
...
New-style (v3) onion services now obey the "max rendezvous circuit
attempts" logic.
Previously they would make as many rendezvous circuit attempts as they
could fit in the MAX_REND_TIMEOUT second window before giving up.
Fixes bug 24894; bugfix on 0.3.2.1-alpha.
2018-01-15 16:41:47 -05:00
Nick Mathewson
a86324d1fa
Remove a needless changefile. (Needless because bug not released.)
2018-01-12 13:30:06 -05:00
Nick Mathewson
edc87b263f
Merge remote-tracking branch 'ffmancera/bug24861'
2018-01-12 13:29:53 -05:00
Fernando Fernandez Mancera
06368e5310
Fix minGW compatibility issue with zu format specifier.
...
Define TOR_PRIuSZ as minGW compiler doesn't support zu format specifier for
size_t type.
Fixes #24861 on ac9eebd
.
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2018-01-12 17:44:30 +01:00
Nick Mathewson
4c651b8c04
Note contactinfo and myfamily as required in more places
...
Includes a sentence from cypherpunks; for ticket 24526.
2018-01-11 20:00:18 -05:00
Nick Mathewson
a3d1c38ea6
Merge branch 'bug24582'
2018-01-11 19:57:57 -05:00
Nick Mathewson
18ea91ee6b
Make the warnings about restarting tor in-process more scary.
2018-01-11 12:46:50 -05:00
Nick Mathewson
05ac3d0458
Merge branch 'restart_nocrash'
2018-01-11 12:45:25 -05:00
Nick Mathewson
c349bfec36
Merge branch 'bug24526_squashed'
2018-01-11 12:33:52 -05:00
Nick Mathewson
ac0f819ce5
Note contactinfo and myfamily as required in more places
...
Includes a sentence from cypherpunks; for ticket 24526.
2018-01-11 12:33:30 -05:00
Nick Mathewson
d0adf5ae95
Merge branch 'bug24584'
2018-01-11 12:28:29 -05:00
Nick Mathewson
7a60600411
Merge remote-tracking branch 'ffmancera/github/bug24573'
2018-01-11 08:31:25 -05:00
Nick Mathewson
c8c258a433
Merge branch 'bug24733_squashed_2'
2018-01-10 12:57:23 -05:00
teor
54899b404c
Stop invoking undefined behaviour by using tor_free() on an unaligned pointer
...
... in get_interface_addresses_ioctl().
This pointer alignment issue exists on x86_64 macOS, but is unlikely to exist
elsewhere. (i386 macOS only requires 4-byte alignment, and other OSs have
8-byte ints.)
Fixes bug 24733; not in any released version of tor.
2018-01-10 12:57:13 -05:00
Nick Mathewson
ca1d1c382c
Merge remote-tracking branch 'ffmancera/github/bug24501'
2018-01-10 12:46:39 -05:00
Nick Mathewson
4715d81809
Merge remote-tracking branch 'teor/Bug-23966'
2018-01-10 09:38:38 -05:00
Nick Mathewson
2d2a0c4116
ticket 22145 changes file
2018-01-10 09:35:11 -05:00
Nick Mathewson
9ba69be96c
Merge branch 'maint-0.3.2'
...
There was a merge conflict on fallback_dirs.inc, which we resolve in
favor of the newly generated version for #24801 .
2018-01-08 11:10:53 -05:00
Nick Mathewson
e3ab27001f
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-08 11:10:36 -05:00