Commit Graph

37458 Commits

Author SHA1 Message Date
Alexander Færøy dcc41e15eb Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-11 12:48:04 +00:00
Alexander Færøy 3d0b4c7c45 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-08-11 12:48:04 +00:00
David Goulet 70d8fb3eab relay: Reduce streaming compression ratio from HIGH to LOW
Fixes #40301

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-11 12:47:20 +00:00
George Kadianakis cb9e346618 Merge branch 'maint-0.4.6' into release-0.4.6 2021-07-07 13:04:39 +03:00
George Kadianakis 8b026b4eee Merge remote-tracking branch 'tor-gitlab/mr/406' into maint-0.4.6 2021-07-07 13:04:24 +03:00
George Kadianakis d89bffb8c7 Merge branch 'maint-0.4.6' into release-0.4.6 2021-07-06 13:52:16 +03:00
George Kadianakis a522aabd3b Merge branch 'maint-0.4.5' into maint-0.4.6 2021-07-06 13:52:15 +03:00
George Kadianakis 4865eabd18 Merge remote-tracking branch 'tor-gitlab/mr/409' into maint-0.4.5 2021-07-06 13:51:58 +03:00
George Kadianakis 7f34440063 Merge branch 'maint-0.4.6' into release-0.4.6 2021-07-06 13:42:53 +03:00
George Kadianakis 167f3bc4ec Merge branch 'maint-0.4.5' into maint-0.4.6 2021-07-06 13:42:53 +03:00
George Kadianakis 98b9df61f6 Merge branch 'mr/395' into maint-0.4.5 2021-07-06 13:42:29 +03:00
Nick Mathewson c1d96358d4 Use native timegm when available.
Continue having a tor_gmtime_impl() unit test so that we can detect
any problems in our replacement function; add a new test function to
make sure that gmtime<->timegm are a round-trip on now-ish times.

This is a fix for bug #40383, wherein we ran into trouble because
tor_timegm() does not believe that time_t should include a count of
leap seconds, but FreeBSD's gmtime believes that it should.  This
disagreement meant that for a certain amount of time each day,
instead of calculating the most recent midnight, our voting-schedule
functions would calculate the second-most-recent midnight, and lead
to an assertion failure.

I am calling this a bugfix on 0.2.0.3-alpha when we first started
calculating our voting schedule in this way.
2021-07-06 13:33:05 +03:00
Nick Mathewson 2bc02b2199 Suppress a clang 12 warning about "suspicious concatenation".
My clang doesn't like it when we write code like this:

    char *list[] = {
       "abc",
       "def",
       "ghi"
       "jkl"
    }

It wonders whether we meant to put a comma between "ghi" and "jkl"
or not, and gives a warning.

To suppress this warning (since in this case, we did mean to omit
the comma), we just wrap the two strings in parentheses.

Closes #40426; bugfix on 0.4.0.4-rc.
2021-07-01 13:03:19 -04:00
Nick Mathewson 1cc6cccdff Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-30 12:02:34 -04:00
Nick Mathewson 2758ae30b3 Bump to 0.4.6.6-dev 2021-06-30 12:01:21 -04:00
Nick Mathewson 60d1fb3d37 Tweak 0466 changelog tor-0.4.6.6 2021-06-30 10:09:24 -04:00
Nick Mathewson 60ffee9d82 Changelog for 0.4.6.6 2021-06-30 09:10:44 -04:00
Nick Mathewson 01fd3ace03 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-30 08:18:42 -04:00
Nick Mathewson 2fff1fc835 Update version to 0.4.6.6. 2021-06-30 08:17:56 -04:00
Nick Mathewson bd3ed77191 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-30 08:15:41 -04:00
Nick Mathewson 4302c0b4a1 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-30 08:15:41 -04:00
Nick Mathewson e60d14bb6b Missing changes file for #40409 2021-06-30 08:14:57 -04:00
David Goulet 2630e4eea1 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-29 10:41:36 -04:00
David Goulet f2647295c0 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-29 10:41:36 -04:00
David Goulet 301ffb71a6 hs: Send back 0xF6 for a v2 onion address
Fixes #40421

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-06-29 09:56:44 -04:00
Nick Mathewson fce99957e2 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.
2021-06-28 09:10:28 -04:00
Nick Mathewson 8edd19ca72 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-26 10:04:38 -04:00
Nick Mathewson 45c8d69cbb Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-26 10:04:38 -04:00
Alexander Færøy 83483bd4f6 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.
2021-06-25 16:43:10 +00:00
David Goulet 3abb9180cb Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-18 14:29:15 -04:00
Alexander Færøy 2c00ad36cd 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
2021-06-18 18:14:07 +00:00
Nick Mathewson e18bf39e66 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-14 11:49:01 -04:00
Nick Mathewson 91aec8dbc1 Bump to 0.4.6.5-dev 2021-06-14 11:48:30 -04:00
Nick Mathewson e04e545173 Merge branch 'maint-0.4.5' into maint-0.4.6
"Ours" to avoid version bump.
2021-06-14 11:47:54 -04:00
Nick Mathewson 9085508310 Bump to 0.4.5.9-dev 2021-06-14 11:47:41 -04:00
Nick Mathewson 5ab97fa603 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-06-14 11:47:29 -04:00
Nick Mathewson 253b83b722 Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
2021-06-14 11:46:20 -04:00
Nick Mathewson 87492154e0 Bump to 0.3.5.15-dev 2021-06-14 11:45:30 -04:00
Nick Mathewson 62a500dd1d Pick a date, draft a blurb tor-0.4.6.5 2021-06-10 13:17:19 -04:00
Nick Mathewson 15b0980bd7 Fold entries into changelog and releasenotes 2021-06-10 13:13:29 -04:00
Nick Mathewson 8e590992c4 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 12:30:29 -04:00
Nick Mathewson 200e9a55e0 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-06-10 12:30:29 -04:00
Nick Mathewson 58ad0302ea Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 12:30:29 -04:00
Nick Mathewson 0ae9fd62fd Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-10 12:30:11 -04:00
George Kadianakis f57b5c48e0 Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsing 2021-06-10 12:11:10 -04:00
Nick Mathewson 7be37a26ac Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 09:55:55 -04:00
Nick Mathewson ae2254e490 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-06-10 09:55:55 -04:00
Nick Mathewson 5481412cd7 Merge branch 'maint-0.4.6' into release-0.4.6 2021-06-10 09:55:55 -04:00
Nick Mathewson 014345ed6a Resolve remaining merge conflicts in relay.c
(My bad!)
2021-06-10 09:55:35 -04:00
Nick Mathewson 3260d323a6 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-06-10 08:53:07 -04:00