]>
git.ipfire.org Git - thirdparty/tor.git/log
George Kadianakis [Thu, 1 Jul 2021 14:42:34 +0000 (17:42 +0300)]
Introduce vanguards-lite subsystem and some of its entry points
Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
Nick Mathewson [Thu, 1 Jul 2021 13:56:35 +0000 (09:56 -0400)]
Merge remote-tracking branch 'tor-gitlab/mr/405'
Nick Mathewson [Wed, 30 Jun 2021 16:02:17 +0000 (12:02 -0400)]
Merge branch 'maint-0.4.6'
"ours" to avoid version bump.
Nick Mathewson [Wed, 30 Jun 2021 16:01:21 +0000 (12:01 -0400)]
Bump to 0.4.6.6-dev
Nick Mathewson [Wed, 30 Jun 2021 14:09:28 +0000 (10:09 -0400)]
Tweak 0466 changelog
Nick Mathewson [Wed, 30 Jun 2021 12:18:24 +0000 (08:18 -0400)]
Merge branch 'maint-0.4.6'
"ours" to avoid version bump.
Nick Mathewson [Wed, 30 Jun 2021 12:17:56 +0000 (08:17 -0400)]
Update version to 0.4.6.6.
Nick Mathewson [Wed, 30 Jun 2021 12:15:41 +0000 (08:15 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Wed, 30 Jun 2021 12:15:41 +0000 (08:15 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Wed, 30 Jun 2021 12:14:57 +0000 (08:14 -0400)]
Missing changes file for #40409
David Goulet [Tue, 29 Jun 2021 14:55:46 +0000 (10:55 -0400)]
Merge branch 'tor-gitlab/mr/275'
David Goulet [Tue, 29 Jun 2021 14:41:36 +0000 (10:41 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
David Goulet [Tue, 29 Jun 2021 14:41:36 +0000 (10:41 -0400)]
Merge branch 'maint-0.4.6'
Steven Engler [Mon, 28 Jun 2021 17:35:11 +0000 (13:35 -0400)]
If TestingTorNetwork, skip perm check on the hs directory
Nick Mathewson [Mon, 28 Jun 2021 13:08:31 +0000 (09:08 -0400)]
Suppress strict-prototypes warning on NSS pk11pub.h header
We already did this in a couple of places, but there are more that
we didn't get. This is necessary for systems with versions of
NSS that don't do their prototypes properly.
Fixes #40409; bugfix on 0.3.5.1-alpha.
George Kadianakis [Mon, 28 Jun 2021 11:11:46 +0000 (14:11 +0300)]
Merge remote-tracking branch 'tor-gitlab/mr/385'
Nick Mathewson [Sat, 26 Jun 2021 14:04:38 +0000 (10:04 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Sat, 26 Jun 2021 14:04:38 +0000 (10:04 -0400)]
Merge branch 'maint-0.4.6'
Alexander Færøy [Fri, 25 Jun 2021 16:29:53 +0000 (16:29 +0000)]
Enable deterministic RNG for address set tests.
This patch enables the deterministic RNG for address set tests,
including the tests which uses address set indirectly via the nodelist
API.
This should prevent random test failures in the highly unlikely case of
a false positive which was seen in tor#40419.
See: tpo/core/tor#40419.
David Goulet [Fri, 18 Jun 2021 18:29:15 +0000 (14:29 -0400)]
Merge branch 'maint-0.4.6'
Alexander Færøy [Thu, 10 Jun 2021 20:04:13 +0000 (20:04 +0000)]
Fix compilation on systems with older compilers.
This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.
See: tpo/core/tor#40410
David Goulet [Wed, 16 Jun 2021 14:53:32 +0000 (10:53 -0400)]
git: Don't pull github anymore in git-pull-all.sh
Signed-off-by: David Goulet <dgoulet@torproject.org>
Nick Mathewson [Mon, 14 Jun 2021 17:10:18 +0000 (13:10 -0400)]
Merge remote-tracking branch 'tor-gitlab/mr/338'
Nick Mathewson [Mon, 14 Jun 2021 17:05:03 +0000 (13:05 -0400)]
Merge remote-tracking branch 'tor-gitlab/mr/397'
Nick Mathewson [Mon, 14 Jun 2021 15:55:48 +0000 (11:55 -0400)]
Copy forward ChangeLog and ReleaseNotes from 0.3.5.15, 0.4.4.9, and 0.4.5.9
Nick Mathewson [Mon, 14 Jun 2021 15:53:12 +0000 (11:53 -0400)]
Copy the 0.4.6.5 changelog and releasenotes to main.
Nick Mathewson [Mon, 14 Jun 2021 15:50:00 +0000 (11:50 -0400)]
Remove 0.4.4 from list-tor-branches.
Nick Mathewson [Mon, 14 Jun 2021 15:48:46 +0000 (11:48 -0400)]
Merge branch 'maint-0.4.6'
"ours" to avoid version bump.
Nick Mathewson [Mon, 14 Jun 2021 15:48:30 +0000 (11:48 -0400)]
Bump to 0.4.6.5-dev
Nick Mathewson [Mon, 14 Jun 2021 15:47:54 +0000 (11:47 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
"Ours" to avoid version bump.
Nick Mathewson [Mon, 14 Jun 2021 15:47:41 +0000 (11:47 -0400)]
Bump to 0.4.5.9-dev
Nick Mathewson [Mon, 14 Jun 2021 15:47:29 +0000 (11:47 -0400)]
Merge branch 'maint-0.4.4' into maint-0.4.5
Nick Mathewson [Mon, 14 Jun 2021 15:46:20 +0000 (11:46 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
Nick Mathewson [Mon, 14 Jun 2021 15:45:30 +0000 (11:45 -0400)]
Bump to 0.3.5.15-dev
Nick Mathewson [Thu, 10 Jun 2021 16:30:30 +0000 (12:30 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Thu, 10 Jun 2021 16:30:29 +0000 (12:30 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Thu, 10 Jun 2021 16:30:29 +0000 (12:30 -0400)]
Merge branch 'maint-0.4.4' into maint-0.4.5
Nick Mathewson [Thu, 10 Jun 2021 16:30:11 +0000 (12:30 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.4
George Kadianakis [Tue, 18 May 2021 14:06:57 +0000 (17:06 +0300)]
Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsing
Nick Mathewson [Thu, 10 Jun 2021 13:55:55 +0000 (09:55 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Thu, 10 Jun 2021 13:55:55 +0000 (09:55 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Thu, 10 Jun 2021 13:55:55 +0000 (09:55 -0400)]
Merge branch 'maint-0.4.4' into maint-0.4.5
Nick Mathewson [Thu, 10 Jun 2021 13:55:35 +0000 (09:55 -0400)]
Resolve remaining merge conflicts in relay.c
(My bad!)
Nick Mathewson [Thu, 10 Jun 2021 12:53:07 +0000 (08:53 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Thu, 10 Jun 2021 12:53:07 +0000 (08:53 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Thu, 10 Jun 2021 12:53:07 +0000 (08:53 -0400)]
Merge branch 'maint-0.4.4' into maint-0.4.5
Nick Mathewson [Thu, 10 Jun 2021 12:52:39 +0000 (08:52 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.4
Conflicts resolved:
src/core/or/relay.c
David Goulet [Thu, 3 Jun 2021 13:33:21 +0000 (09:33 -0400)]
TROVE-2021-003: Check layer_hint before half-closed end and resolve cells
This issue was reported by Jann Horn part of Google's Project Zero.
Jann's one-sentence summary: entry/middle relays can spoof RELAY_END cells on
half-closed streams, which can lead to stream confusion between OP and
exit.
Fixes #40389
Nick Mathewson [Thu, 10 Jun 2021 12:42:15 +0000 (08:42 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Thu, 10 Jun 2021 12:42:15 +0000 (08:42 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Thu, 10 Jun 2021 12:42:15 +0000 (08:42 -0400)]
Merge branch 'maint-0.4.4' into maint-0.4.5
Nick Mathewson [Thu, 10 Jun 2021 12:42:15 +0000 (08:42 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.4
Nick Mathewson [Thu, 10 Jun 2021 12:41:59 +0000 (08:41 -0400)]
Merge branch 'bug40391_035' into maint-0.3.5
Nick Mathewson [Thu, 10 Jun 2021 12:37:34 +0000 (08:37 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Thu, 10 Jun 2021 12:37:34 +0000 (08:37 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Thu, 10 Jun 2021 12:37:34 +0000 (08:37 -0400)]
Merge branch 'maint-0.4.4' into maint-0.4.5
Nick Mathewson [Thu, 10 Jun 2021 12:37:26 +0000 (08:37 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.4
Nick Mathewson [Thu, 10 Jun 2021 12:34:25 +0000 (08:34 -0400)]
Merge branch 'bug40390_035_squashed' into maint-0.3.5
Nick Mathewson [Mon, 17 May 2021 12:50:01 +0000 (08:50 -0400)]
Assert on _all_ failures from RAND_bytes().
Previously, we would detect errors from a missing RNG
implementation, but not failures from the RNG code itself.
Fortunately, it appears those failures do not happen in practice
when Tor is using OpenSSL's default RNG implementation. Fixes bug
40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as
TROVE-2021-004. Reported by Jann Horn at Google's Project Zero.
Nick Mathewson [Thu, 10 Jun 2021 12:21:49 +0000 (08:21 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Thu, 10 Jun 2021 12:21:48 +0000 (08:21 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Thu, 10 Jun 2021 12:21:48 +0000 (08:21 -0400)]
Merge branch 'maint-0.4.4' into maint-0.4.5
Nick Mathewson [Thu, 10 Jun 2021 12:21:47 +0000 (08:21 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.4
Nick Mathewson [Thu, 10 Jun 2021 12:20:13 +0000 (08:20 -0400)]
Update geoip files to match ipfire location db, 2021/06/10.
Nick Mathewson [Tue, 8 Jun 2021 16:47:57 +0000 (12:47 -0400)]
Modernize our libfuzzer usage to close #40407
Additionally, remove lingering references to hsv2 fuzzers from the
fuzzing_include_am.py script.
Emily Bones [Mon, 7 Jun 2021 20:29:29 +0000 (20:29 +0000)]
Add links to original design paper and anonbib
Closes #33742
Nick Mathewson [Mon, 7 Jun 2021 17:51:05 +0000 (13:51 -0400)]
Add a checklist to releasingtor.md
Nick Mathewson [Mon, 7 Jun 2021 17:50:53 +0000 (13:50 -0400)]
Copy 0.4.5.8 changelog into the main branch changelog.
Nick Mathewson [Mon, 7 Jun 2021 17:32:18 +0000 (13:32 -0400)]
Merge branch 'maint-0.4.6'
"ours" to avoid version bump.
Nick Mathewson [Mon, 7 Jun 2021 17:32:07 +0000 (13:32 -0400)]
Bump to 0.4.6.5
Nick Mathewson [Mon, 7 Jun 2021 17:31:21 +0000 (13:31 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
"ours" to avoid version bump.
Nick Mathewson [Mon, 7 Jun 2021 17:31:10 +0000 (13:31 -0400)]
Bump to 0.4.5.9.
Nick Mathewson [Mon, 7 Jun 2021 17:30:36 +0000 (13:30 -0400)]
Merge branch 'maint-0.4.4' into maint-0.4.5
"ours" to avoid version bump.
Nick Mathewson [Mon, 7 Jun 2021 17:30:18 +0000 (13:30 -0400)]
Bump to 0.4.4.9
Nick Mathewson [Mon, 7 Jun 2021 17:29:49 +0000 (13:29 -0400)]
Merge branch 'maint-0.3.5' into maint-0.4.4
Nick Mathewson [Mon, 7 Jun 2021 17:29:35 +0000 (13:29 -0400)]
Bump to 0.3.5.15.
Nick Mathewson [Tue, 1 Jun 2021 16:16:42 +0000 (12:16 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Tue, 1 Jun 2021 16:16:35 +0000 (12:16 -0400)]
Merge branch 'bug40175_045' into maint-0.4.6
Nick Mathewson [Tue, 1 Jun 2021 16:16:06 +0000 (12:16 -0400)]
changes file for #40175
David Goulet [Tue, 1 Jun 2021 12:48:04 +0000 (08:48 -0400)]
Merge branch 'maint-0.4.6'
David Goulet [Tue, 1 Jun 2021 12:47:56 +0000 (08:47 -0400)]
Merge branch 'tor-gitlab/mr/393' into maint-0.4.6
Nick Mathewson [Fri, 28 May 2021 16:27:48 +0000 (12:27 -0400)]
copy 0.4.6.4-rc changelog forward
Nick Mathewson [Fri, 28 May 2021 16:21:15 +0000 (12:21 -0400)]
Merge branch 'maint-0.4.6'
"ours" to avoid version bump.
Nick Mathewson [Fri, 28 May 2021 16:20:48 +0000 (12:20 -0400)]
Bump to 0.4.6.4-rc-dev
Nick Mathewson [Fri, 28 May 2021 12:05:00 +0000 (08:05 -0400)]
Merge branch 'maint-0.4.6'
"ours" to avoid version bump.
Nick Mathewson [Fri, 28 May 2021 12:04:42 +0000 (08:04 -0400)]
Bump to 0.4.6.4-rc.
Nick Mathewson [Fri, 28 May 2021 12:03:43 +0000 (08:03 -0400)]
Merge branch 'maint-0.4.6'
Nick Mathewson [Fri, 28 May 2021 12:03:43 +0000 (08:03 -0400)]
Merge branch 'maint-0.4.5' into maint-0.4.6
Nick Mathewson [Fri, 28 May 2021 12:02:08 +0000 (08:02 -0400)]
Stop using the "x$FOO" idiom in git-resquash.sh
The new version of shellcheck says that that this idiom is
unnecessary, and its presence here is making the shellcheck tests
fail.
No changes file needed, since this is not user-facing code.
Roger Dingledine [Thu, 27 May 2021 18:22:22 +0000 (14:22 -0400)]
clarify three comments
based on code-spelunking with nickm
Nick Mathewson [Thu, 27 May 2021 14:49:37 +0000 (10:49 -0400)]
Upgrade and rate-limit compression failure message.
Without this message getting logged at 'WARN', it's hard to
contextualize the messages we get about compression bombs, so this
message should fix #40175.
I'm rate-limiting this, however, since it _could_ get spammy if
somebody on the network starts acting up. (Right now it should be
very quiet; I've asked Sebastian to check it, and he says that he
doesn't hit this message in practice.)
Closes #40175.
David Goulet [Thu, 27 May 2021 14:12:16 +0000 (10:12 -0400)]
Merge branch 'tor-gitlab/mr/359'
David Goulet [Thu, 27 May 2021 14:01:49 +0000 (10:01 -0400)]
Merge branch 'maint-0.4.6'
David Goulet [Thu, 27 May 2021 14:01:44 +0000 (10:01 -0400)]
Merge branch 'tor-gitlab/mr/392' into maint-0.4.6
Nick Mathewson [Wed, 26 May 2021 17:02:56 +0000 (13:02 -0400)]
Prefer mmap()ed consensus files over cached_dir_t entries.
Cached_dir_t is a somewhat "legacy" kind of storage when used for
consensus documents, and it appears that there are cases when
changing our settings causes us to stop updating those entries.
This can cause trouble, as @arma found out in #40375, where he
changed his settings around, and consensus diff application got
messed up: consensus diffs were being _requested_ based on the
latest consensus, but were being (incorrectly) applied to a
consensus that was no longer the latest one.
This patch is a minimal fix for backporting purposes: it has Tor do
the same search when applying consensus diffs as we use to request
them. This should be sufficient for correct behavior.
There's a similar case in GETINFO handling; I've fixed that too.
Fixes #40375; bugfix on 0.3.1.1-alpha.
Alexander Færøy [Tue, 25 May 2021 14:17:12 +0000 (14:17 +0000)]
Merge remote-tracking branch 'tor-gitlab/mr/388' into main
Alexander Færøy [Tue, 25 May 2021 13:58:55 +0000 (13:58 +0000)]
Merge remote-tracking branch 'tor-gitlab/mr/380' into main
Alexander Færøy [Tue, 25 May 2021 13:25:23 +0000 (13:25 +0000)]
Merge branch 'maint-0.3.5' into maint-0.4.4
Alexander Færøy [Tue, 25 May 2021 13:25:23 +0000 (13:25 +0000)]
Merge branch 'maint-0.4.4' into maint-0.4.5
Alexander Færøy [Tue, 25 May 2021 13:25:23 +0000 (13:25 +0000)]
Merge branch 'maint-0.4.5' into maint-0.4.6