Commit Graph

36133 Commits

Author SHA1 Message Date
Nick Mathewson a93f736337 Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-16 09:18:52 -04:00
Nick Mathewson 94fb308c5d Bump version to 0.4.4.8-dev 2021-03-16 09:17:56 -04:00
Nick Mathewson 5fac24053d Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
2021-03-16 09:17:40 -04:00
Nick Mathewson 3271c0bde7 Bump to 0.3.5.14-dev 2021-03-16 09:17:31 -04:00
Nick Mathewson fecc195294 Copy 0.4.4.8 changelog to releasenotes tor-0.4.4.8 2021-03-16 08:28:50 -04:00
Nick Mathewson e8f7b22fa5 changelog updates from arma 2021-03-15 17:12:46 -04:00
Nick Mathewson 15bac08f1c Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-15 09:41:38 -04:00
Nick Mathewson f2cfd1ffad Remove check-best-practices from check-local in 0.4.4 2021-03-15 09:41:19 -04:00
Nick Mathewson ecdc6ac498 Changelog for 0.4.4.8. 2021-03-15 09:25:02 -04:00
Nick Mathewson 5ec579610a Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-15 09:01:59 -04:00
Nick Mathewson ecf1ba9746 Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-15 09:01:59 -04:00
Nick Mathewson f078aab71e Merge branch 'bug40316_035_v2' into maint-0.3.5 2021-03-15 08:58:54 -04:00
Nick Mathewson 890ae4fb1a Fix detection of point to insert signatures on a pending consensus.
We were looking for the first instance of "directory-signature "
when instead the correct behavior is to look for the first instance
of "directory-signature " at the start of a line.

Unfortunately, this can be exploited as to crash authorities while
they're voting.

Fixes #40316; bugfix on 0.2.2.4-alpha.  This is TROVE-2021-002,
also tracked as CVE-2021-28090.
2021-03-15 08:56:58 -04:00
Nick Mathewson 2eb900f7e2 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-15 08:54:00 -04:00
Nick Mathewson b3c891119c Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-15 08:54:00 -04:00
Nick Mathewson efca9ce41c Clarify new intended strategy with TROVE-2021-001
We're going to disable this feature in all versions for now.
2021-03-15 08:53:36 -04:00
Nick Mathewson b9f6539008 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-15 08:52:28 -04:00
Nick Mathewson 4a538847a8 Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-15 08:52:28 -04:00
Nick Mathewson f46f4562cf Merge branch 'bug40286_disable_min_035' into maint-0.3.5 2021-03-15 08:41:03 -04:00
Nick Mathewson c63e09043a Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-15 07:42:55 -04:00
Nick Mathewson fb2c889a38 Bump to 0.4.4.8 2021-03-15 07:40:48 -04:00
Nick Mathewson 8ada4263a9 Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
2021-03-15 07:40:06 -04:00
Nick Mathewson 1a0b5fd569 Bump to 0.3.5.14 2021-03-15 07:39:45 -04:00
Nick Mathewson 1a407612bc Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-12 11:36:34 -05:00
Nick Mathewson 9f59b6f458 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-12 11:36:34 -05:00
Nick Mathewson 02230575c4 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) 2021-03-12 11:36:28 -05:00
Nick Mathewson c1ce126c74 Use the right ticket number. 2021-03-12 11:31:36 -05:00
Nick Mathewson 877f7bbb47 Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-12 11:30:21 -05:00
Nick Mathewson 41796158e6 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-12 11:30:21 -05:00
Nick Mathewson aa6c7741e8 update geoip-2021-03-12 to mention provider transition. 2021-03-12 11:29:09 -05:00
Nick Mathewson a7b3cb06f5 Update geoip files to match ipfire location db, 2021/03/12. 2021-03-12 11:26:07 -05:00
David Goulet 34ad10db54 Merge branch 'maint-0.4.4' into release-0.4.4 2021-03-01 08:33:47 -05:00
David Goulet eb1759633a Merge branch 'maint-0.3.5' into maint-0.4.4 2021-03-01 08:33:41 -05:00
David Goulet ad4f87ed3f Remove mallinfo() from codebase
Now deprecated in libc >= 2.33

Closes #40309

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-23 12:16:58 -05:00
David Goulet 296a557bfc Remove mallinfo() from codebase
Now deprecated in libc >= 2.33

Closes #40309

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-23 11:02:33 -05:00
Nick Mathewson ede88c374c Disable the dump_desc() function.
It can be called with strings that should have been
length-delimited, but which in fact are not.  This can cause a
CPU-DoS bug or, in a worse case, a crash.

Since this function isn't essential, the best solution for older
Tors is to just turn it off.

Fixes bug 40286; bugfix on 0.2.2.1-alpha when dump_desc() was
introduced.
2021-02-19 12:31:19 -05:00
Alexander Færøy a9e3f73d67 Merge branch 'maint-0.4.4' into release-0.4.4 2021-02-05 19:19:34 +00:00
Alexander Færøy 49c61c1bb8 Delete changes/40241_v2 as it breaks CI.
Unreviewed build fix. Discussed the cnage on IRC with Nick.
2021-02-05 19:18:13 +00:00
Alexander Færøy d9bfe60561 Merge branch 'maint-0.4.4' into release-0.4.4 2021-02-05 17:40:25 +00:00
Alexander Færøy aa1a053d55 Fix CI build: practracker error in connection_edge.c, take two.
This was a bad copy and paste error from the previous commit which
generated a duplicated entry error from practracker.

Unreviewed build fix.

See: tor#40275.
2021-02-05 17:39:21 +00:00
Alexander Færøy 817cf01831 Merge branch 'maint-0.4.4' into release-0.4.4 2021-02-05 17:17:04 +00:00
Alexander Færøy 62b98716ff Fix CI build: practracker error in connection_edge.c.
We solve this error by allowing the connection_exit_connect() function
to be 130 lines long.

Unreviewed build fix commit.

See: tor#40275.
2021-02-05 17:16:05 +00:00
Alexander Færøy af9107aff2 Fix Windows build.
While trying to resolve our CI issues, the Windows build broke with an
unused function error:

   src/test/test_switch_id.c:37:1: error: ‘unprivileged_port_range_start’
   defined but not used [-Werror=unused-function]

We solve this by moving the `#if !defined(_WIN32)` test above the
`unprivileged_port_range_start()` function defintion such that it is
included in its body.

This is an unreviewed commit.

See: tor#40275
2021-02-05 17:12:52 +00:00
Alexander Færøy 4b332ce62a Merge branch 'maint-0.4.4' into release-0.4.4 2021-02-05 16:05:57 +00:00
Alexander Færøy 6578a3e865 Merge branch 'tor-gitlab/mr/292_squashed' into maint-0.4.4 2021-02-05 16:04:53 +00:00
Alexander Færøy 67aefd5520 Only check for bindable ports if we are unsure if it will fail.
We currently assume that the only way for Tor to listen on ports in the
privileged port range (1 to 1023), on Linux, is if we are granted the
NET_BIND_SERVICE capability. Today on Linux, it's possible to specify
the beginning of the unprivileged port range using a sysctl
configuration option. Docker (and thus the CI service Tor uses) recently
changed this sysctl value to 0, which causes our tests to fail as they
assume that we should NOT be able to bind to a privileged port *without*
the NET_BIND_SERVICE capability.

In this patch, we read the value of the sysctl value via the /proc/sys/
filesystem iff it's present, otherwise we assume the default
unprivileged port range begins at port 1024.

See: tor#40275
2021-02-05 16:04:21 +00:00
Nick Mathewson 306e8f87bc Merge branch 'maint-0.4.4' into release-0.4.4 2021-02-03 13:39:55 -05:00
Nick Mathewson 2933c37188 Merge branch 'maint-0.4.3' into maint-0.4.4
"ours" to avoid version bump.
2021-02-03 13:39:28 -05:00
Nick Mathewson 8a17999da3 Merge branch 'maint-0.3.5' into maint-0.4.3
"ours" to avoid version bump.
2021-02-03 13:39:08 -05:00
Nick Mathewson f3ba71bbee bump to 0.4.4.7-dev 2021-02-03 13:39:03 -05:00