]>
git.ipfire.org Git - thirdparty/tor.git/log
Fernando Fernandez Mancera [Wed, 24 Jan 2018 19:07:49 +0000 (20:07 +0100)]
Clarify directory and ORPort checking functions.
In order to make the OR and dir checking functions in router.c less confusing
we renamed some functions and splitted consider_testing_reachability() into
router_should_check_reachability() and router_do_reachability_checks(). Also we
improved the documentation.
Fixes #18918.
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
Roger Dingledine [Fri, 19 Jan 2018 23:42:53 +0000 (18:42 -0500)]
oxford comma for-the-win
Nick Mathewson [Fri, 19 Jan 2018 22:29:36 +0000 (17:29 -0500)]
Add a "falls through" comment to make gcc happy.
Nick Mathewson [Fri, 19 Jan 2018 22:28:10 +0000 (17:28 -0500)]
Merge remote-tracking branch 'mikeperry/bug23101-mergeready-squashed'
Mike Perry [Fri, 22 Dec 2017 06:35:29 +0000 (06:35 +0000)]
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.
Mike Perry [Sat, 2 Dec 2017 02:28:16 +0000 (02:28 +0000)]
Add new circuit purposes for hsdir activity.
This lets us control their path len and usage.
Mike Perry [Fri, 22 Dec 2017 05:43:44 +0000 (05:43 +0000)]
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.
Nick Mathewson [Fri, 19 Jan 2018 21:35:24 +0000 (16:35 -0500)]
Merge branch 'disable_signal_handlers'
Nick Mathewson [Fri, 19 Jan 2018 21:30:53 +0000 (16:30 -0500)]
Merge branch 'maint-0.3.2'
Nick Mathewson [Fri, 19 Jan 2018 21:30:50 +0000 (16:30 -0500)]
Merge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 19 Jan 2018 21:30:44 +0000 (16:30 -0500)]
Merge remote-tracking branch 'dgoulet/bug24895_032_02' into maint-0.3.2
Nick Mathewson [Fri, 19 Jan 2018 21:30:12 +0000 (16:30 -0500)]
Merge branch 'maint-0.3.0' into maint-0.3.1
"ours" merge to avoid maint-0.3.0's version of 24895.
Nick Mathewson [Fri, 19 Jan 2018 21:30:02 +0000 (16:30 -0500)]
Merge remote-tracking branch 'dgoulet/bug24895_031_02' into maint-0.3.1
Nick Mathewson [Fri, 19 Jan 2018 21:29:43 +0000 (16:29 -0500)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Conflicts:
src/or/rendservice.c
Nick Mathewson [Fri, 19 Jan 2018 21:29:15 +0000 (16:29 -0500)]
Merge remote-tracking branch 'dgoulet/bug24895_029_02' into maint-0.2.9
David Goulet [Fri, 19 Jan 2018 21:26:26 +0000 (16:26 -0500)]
Merge branch 'bug24895_031_02' into bug24895_032_02
David Goulet [Fri, 19 Jan 2018 21:21:55 +0000 (16:21 -0500)]
Merge branch 'bug24895_029_02' into bug24895_031_02
Roger Dingledine [Fri, 19 Jan 2018 08:00:43 +0000 (03:00 -0500)]
hs: Use hs_service_max_rdv_failures consensus param, defaulting to 2
Nick Mathewson [Fri, 19 Jan 2018 15:18:59 +0000 (10:18 -0500)]
Merge branch 'maint-0.3.2'
Nick Mathewson [Fri, 19 Jan 2018 15:18:55 +0000 (10:18 -0500)]
Merge remote-tracking branch 'tlyu-github/travis-workaround-master'
Nick Mathewson [Fri, 19 Jan 2018 15:18:35 +0000 (10:18 -0500)]
Merge branch 'maint-0.3.1'
"ours" merge to avoid the 0.3.1 version of the 24863 fix.
Nick Mathewson [Fri, 19 Jan 2018 15:18:29 +0000 (10:18 -0500)]
Merge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Fri, 19 Jan 2018 15:18:21 +0000 (10:18 -0500)]
Merge remote-tracking branch 'tlyu-github/travis-workaround-031' into maint-0.3.1
Nick Mathewson [Fri, 19 Jan 2018 15:17:33 +0000 (10:17 -0500)]
Merge branch 'maint-0.3.0' into maint-0.3.1
"ours" merge to avoid 0.2.5 version of #24863 fix.
Nick Mathewson [Fri, 19 Jan 2018 15:17:05 +0000 (10:17 -0500)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Fri, 19 Jan 2018 15:16:47 +0000 (10:16 -0500)]
Merge branch 'maint-0.2.5' into maint-0.2.9
Nick Mathewson [Fri, 19 Jan 2018 15:02:20 +0000 (10:02 -0500)]
Improve documentation for signal code
Nick Mathewson [Fri, 19 Jan 2018 14:52:14 +0000 (09:52 -0500)]
Merge branch 'restart_debug_squashed'
Nick Mathewson [Mon, 11 Dec 2017 15:57:00 +0000 (10:57 -0500)]
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.
Nick Mathewson [Fri, 19 Jan 2018 14:45:10 +0000 (09:45 -0500)]
Don't call Libevent's event_base_free() on NULL.
It doesn't crash, but it produces a warning.
Fixes bug 24933; bugfix on
322abc030e53c7e84ca9f22a47b2965f2 . Bug
not in any released Tor.
Roger Dingledine [Fri, 19 Jan 2018 07:38:07 +0000 (02:38 -0500)]
turn MAX_REND_FAILURES into a function
no actual changes in behavior
Roger Dingledine [Mon, 15 Jan 2018 21:30:55 +0000 (16:30 -0500)]
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.
Nick Mathewson [Thu, 18 Jan 2018 13:13:48 +0000 (08:13 -0500)]
Merge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Thu, 18 Jan 2018 13:13:48 +0000 (08:13 -0500)]
Merge branch 'maint-0.3.2'
Nick Mathewson [Thu, 18 Jan 2018 13:13:45 +0000 (08:13 -0500)]
Merge branch 'bug24826_031' into maint-0.3.1
Taylor Yu [Wed, 10 Jan 2018 20:52:04 +0000 (14:52 -0600)]
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.
Taylor Yu [Wed, 10 Jan 2018 20:52:04 +0000 (14:52 -0600)]
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.
Taylor Yu [Wed, 10 Jan 2018 20:52:04 +0000 (14:52 -0600)]
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.
Nick Mathewson [Wed, 17 Jan 2018 18:26:41 +0000 (13:26 -0500)]
Merge branch 'bug22798_029_squashed'
Nick Mathewson [Wed, 17 Jan 2018 16:13:18 +0000 (11:13 -0500)]
Merge branch 'maint-0.3.2'
Nick Mathewson [Wed, 17 Jan 2018 16:12:15 +0000 (11:12 -0500)]
Merge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Wed, 17 Jan 2018 15:50:58 +0000 (10:50 -0500)]
Merge branch 'maint-0.3.2'
Nick Mathewson [Wed, 17 Jan 2018 15:49:45 +0000 (10:49 -0500)]
Merge remote-tracking branch 'arma/bug24894' into maint-0.3.2
Nick Mathewson [Tue, 16 Jan 2018 19:35:49 +0000 (14:35 -0500)]
update comment; ignore argument on non-win
Nick Mathewson [Tue, 16 Jan 2018 19:23:56 +0000 (14:23 -0500)]
Improve Windows performance with SIO_IDEAL_SEND_BACKLOG_QUERY.
Patch written by "Vort" on trac. Addresses ticket 22798.
Nick Mathewson [Wed, 17 Jan 2018 14:07:50 +0000 (09:07 -0500)]
Merge branch 'bug21074_029'
Nick Mathewson [Wed, 17 Jan 2018 14:06:32 +0000 (09:06 -0500)]
Add a cast to avoid a signed/unsigned comparison
Nick Mathewson [Tue, 16 Jan 2018 19:41:43 +0000 (14:41 -0500)]
fix a check-changes warning
Nick Mathewson [Tue, 16 Jan 2018 19:13:39 +0000 (14:13 -0500)]
Merge branch 'bug21074_029'
Nick Mathewson [Tue, 16 Jan 2018 18:36:48 +0000 (13:36 -0500)]
Merge branch 'maint-0.3.2'
Nick Mathewson [Tue, 16 Jan 2018 18:35:52 +0000 (13:35 -0500)]
Merge remote-tracking branch 'public/bug24652_032' into maint-0.3.2
Nick Mathewson [Tue, 16 Jan 2018 18:31:29 +0000 (13:31 -0500)]
Merge branch 'stack_em_up'
Nick Mathewson [Tue, 16 Jan 2018 18:29:11 +0000 (13:29 -0500)]
Repair a crash bug in src/test/bench
This was caused because of the new KeyDirectory and CacheDirectory
options not being set. Bugfix on 0.3.3.0-alpha; not in any released
Tor.
Nick Mathewson [Tue, 16 Jan 2018 17:42:40 +0000 (12:42 -0500)]
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.
Nick Mathewson [Tue, 16 Jan 2018 13:56:07 +0000 (08:56 -0500)]
Update scan-build.sh to work with the latest clangalyzer
Nick Mathewson [Tue, 16 Jan 2018 13:36:34 +0000 (08:36 -0500)]
Fix a (spurious) scan-build warning in test_introduce1_validation()
Since helper_create_introduce1_cell() checks "cell" for nullness,
scan-build is concerned that test_introduce1_validation()
dereferences it without checking it. So, add a check.
Not backporting, since this is spurious, _and_ tests-only.
Roger Dingledine [Tue, 16 Jan 2018 03:33:40 +0000 (22:33 -0500)]
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.
Roger Dingledine [Mon, 15 Jan 2018 21:41:47 +0000 (16:41 -0500)]
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.
Nick Mathewson [Fri, 12 Jan 2018 18:30:06 +0000 (13:30 -0500)]
Remove a needless changefile. (Needless because bug not released.)
Nick Mathewson [Fri, 12 Jan 2018 18:29:53 +0000 (13:29 -0500)]
Merge remote-tracking branch 'ffmancera/bug24861'
Fernando Fernandez Mancera [Fri, 12 Jan 2018 16:44:30 +0000 (17:44 +0100)]
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>
Nick Mathewson [Fri, 12 Jan 2018 01:00:39 +0000 (20:00 -0500)]
Merge branch 'maint-0.3.2'
Sebastian Hahn [Thu, 11 Jan 2018 21:03:14 +0000 (22:03 +0100)]
Reword requirement to set Myfamily correctly
Nick Mathewson [Wed, 20 Dec 2017 16:10:14 +0000 (11:10 -0500)]
Note contactinfo and myfamily as required in more places
Includes a sentence from cypherpunks; for ticket 24526.
Nick Mathewson [Fri, 12 Jan 2018 00:59:32 +0000 (19:59 -0500)]
Merge remote-tracking branch 'sebastian/myfamily'
Nick Mathewson [Fri, 12 Jan 2018 00:57:57 +0000 (19:57 -0500)]
Merge branch 'bug24582'
Sebastian Hahn [Thu, 11 Jan 2018 21:03:14 +0000 (22:03 +0100)]
Reword requirement to set Myfamily correctly
Nick Mathewson [Thu, 11 Jan 2018 17:49:28 +0000 (12:49 -0500)]
On shutdown, mark openssl as uninitialized.
This causes openssl to get completely reinitialized on startup,
which is probably a good idea.
Nick Mathewson [Thu, 11 Jan 2018 17:46:50 +0000 (12:46 -0500)]
Make the warnings about restarting tor in-process more scary.
Nick Mathewson [Thu, 11 Jan 2018 17:45:25 +0000 (12:45 -0500)]
Merge branch 'restart_nocrash'
Nick Mathewson [Thu, 11 Jan 2018 17:39:37 +0000 (12:39 -0500)]
Merge branch 'simplify_transition_allowed'
Nick Mathewson [Thu, 11 Jan 2018 17:33:52 +0000 (12:33 -0500)]
Merge branch 'bug24526_squashed'
Nick Mathewson [Wed, 20 Dec 2017 16:10:14 +0000 (11:10 -0500)]
Note contactinfo and myfamily as required in more places
Includes a sentence from cypherpunks; for ticket 24526.
Nick Mathewson [Thu, 11 Jan 2018 17:29:29 +0000 (12:29 -0500)]
Add a blank line per dgoulet review.
Nick Mathewson [Thu, 11 Jan 2018 17:28:29 +0000 (12:28 -0500)]
Merge branch 'bug24584'
Nick Mathewson [Thu, 11 Jan 2018 16:31:03 +0000 (11:31 -0500)]
Compute flavor name before dereference, to avoid a STACK warning.
(See 24423)
Nick Mathewson [Thu, 11 Jan 2018 13:31:25 +0000 (08:31 -0500)]
Merge remote-tracking branch 'ffmancera/github/bug24573'
Nick Mathewson [Wed, 10 Jan 2018 17:57:23 +0000 (12:57 -0500)]
Merge branch 'bug24733_squashed_2'
Nick Mathewson [Wed, 10 Jan 2018 14:55:01 +0000 (09:55 -0500)]
Document the alignment limitation of tor_free()
Nick Mathewson [Wed, 10 Jan 2018 14:51:45 +0000 (09:51 -0500)]
Extract the raw_free() of ifc_buf into a new function.
Explain the problem more correctly.
teor [Sun, 24 Dec 2017 11:36:52 +0000 (22:36 +1100)]
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.
Nick Mathewson [Wed, 10 Jan 2018 17:46:39 +0000 (12:46 -0500)]
Merge remote-tracking branch 'ffmancera/github/bug24501'
Nick Mathewson [Wed, 10 Jan 2018 14:39:13 +0000 (09:39 -0500)]
Remove needless parentheses
Nick Mathewson [Wed, 10 Jan 2018 14:38:38 +0000 (09:38 -0500)]
Merge remote-tracking branch 'teor/Bug-23966'
Nick Mathewson [Wed, 10 Jan 2018 14:35:11 +0000 (09:35 -0500)]
ticket 22145 changes file
Nick Mathewson [Wed, 10 Jan 2018 14:33:55 +0000 (09:33 -0500)]
Merge remote-tracking branch 'teor/bug22145_032'
Nick Mathewson [Tue, 9 Jan 2018 15:12:43 +0000 (10:12 -0500)]
Merge branch 'maint-0.3.2'
"ours" merge to avoid version bump.
Nick Mathewson [Tue, 9 Jan 2018 15:12:25 +0000 (10:12 -0500)]
Increment version to 0.3.2.9-dev
Nick Mathewson [Tue, 9 Jan 2018 15:11:46 +0000 (10:11 -0500)]
Forward-port changelog and releasenotes for 0.3.2.9
Nick Mathewson [Mon, 8 Jan 2018 16:39:38 +0000 (11:39 -0500)]
Merge branch 'maint-0.3.2'
"ours" merge to avoid version bump.
Nick Mathewson [Mon, 8 Jan 2018 16:39:24 +0000 (11:39 -0500)]
Increment version to 0.3.2.9
Nick Mathewson [Mon, 8 Jan 2018 16:10:53 +0000 (11:10 -0500)]
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.
Nick Mathewson [Mon, 8 Jan 2018 16:10:36 +0000 (11:10 -0500)]
Merge branch 'maint-0.2.9' into maint-0.3.0
Nick Mathewson [Mon, 8 Jan 2018 16:10:36 +0000 (11:10 -0500)]
Merge branch 'maint-0.3.0' into maint-0.3.1
Nick Mathewson [Mon, 8 Jan 2018 16:10:36 +0000 (11:10 -0500)]
Merge branch 'maint-0.3.1' into maint-0.3.2
Nick Mathewson [Mon, 8 Jan 2018 16:09:08 +0000 (11:09 -0500)]
Add changes file for new fallback directory list.
Nick Mathewson [Mon, 8 Jan 2018 16:03:44 +0000 (11:03 -0500)]
Add 7 other fallback dirs from teor's tests
These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc"
Nick Mathewson [Mon, 8 Jan 2018 15:57:06 +0000 (10:57 -0500)]
Update the fallback_dirs.inc file: part 1
This takes the updated fallback_dirs_2018_01_06_CA.inc from
pastly's scan.
Nick Mathewson [Mon, 8 Jan 2018 15:45:40 +0000 (10:45 -0500)]
Merge remote-tracking branch 'arma/bug24555'
Nick Mathewson [Mon, 8 Jan 2018 14:35:55 +0000 (09:35 -0500)]
Merge branch 'maint-0.3.1' into maint-0.3.2