Commit Graph

31524 Commits

Author SHA1 Message Date
David Goulet 869fa2a2ef Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-28 12:00:17 -05:00
David Goulet 2cf1365c17 Merge branch 'tor-gitlab/mr/186' into maint-0.3.5 2021-01-28 12:00:10 -05:00
Nick Mathewson dec3041952 Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-28 11:20:20 -05:00
Nick Mathewson 3ebf75993f Bump to 0.3.5.13. 2021-01-28 11:17:32 -05:00
David Goulet d4e5066bf2 Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-21 16:18:43 -05:00
Alex Xu (Hello71) 65087903d9 gitignore: don't ignore core directory
otherwise src/core is ignored.
2021-01-21 16:18:22 -05:00
David Goulet 5ba521297f Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-21 16:06:54 -05:00
David Goulet 8500700aa4 build: Add "make lsp" command
Generates the compile_commands.json file using the "bear" application so the
ccls server can be more efficient with our code base.

Closes #40227

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-21 16:06:31 -05:00
Nick Mathewson 05ee5b983c Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-19 12:53:52 -05:00
Nick Mathewson faf7b550e7 Merge remote-tracking branch 'tor-gitlab/mr/143' into maint-0.3.5 2021-01-19 12:53:30 -05:00
Nick Mathewson e85f517831 Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-19 12:45:07 -05:00
Nick Mathewson 2d5b21598e Merge remote-tracking branch 'tor-gitlab/mr/259' into maint-0.3.5 2021-01-19 12:44:59 -05:00
David Goulet 9e03ef3e6b Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-13 10:38:05 -05:00
David Goulet 7a82fbfdab gitignore: Add Linux core file patterns
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-13 10:37:56 -05:00
Nick Mathewson fa8ecf8820 Better fix for #40241 (--enable-all-bugs-are-fatal and fallthrough)
This one should work on GCC _and_ on Clang.  The previous version
made Clang happier by not having unreachable "fallthrough"
statements, but made GCC sad because GCC didn't think that the
unconditional failures were really unconditional, and therefore
_wanted_ a FALLTHROUGH.

This patch adds a FALLTHROUGH_UNLESS_ALL_BUGS_ARE_FATAL macro that
seems to please both GCC and Clang in this case: ordinarily it is a
FALLTHROUGH, but when ALL_BUGS_ARE_FATAL is defined, it's an
abort().

Fixes bug 40241 again.  Bugfix on earlier fix for 40241, which was
merged into maint-0.3.5 and forward, and released in 0.4.5.3-rc.
2021-01-13 09:54:43 -05:00
Nick Mathewson 5aceb7ca19 Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-11 14:37:28 -05:00
Nick Mathewson 6c0f15500b Merge branch 'ticket40241_035' into maint-0.3.5 2021-01-11 14:37:14 -05:00
Nick Mathewson ccdbbae4ec Fix warnings in current debian-hardened CI.
We're getting "fallback annotation annotation in unreachable code"
warnings when we build with ALL_BUGS_ARE_FATAL. This patch fixes
that.

Fixes bug 40241.  Bugfix on 0.3.5.4-alpha.
2021-01-11 14:25:56 -05:00
Nick Mathewson 6cd23b29d2 Merge branch 'maint-0.3.5' into release-0.3.5 2020-11-16 22:42:22 -05:00
Nick Mathewson fcae26adf7 Merge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5 2020-11-16 22:42:15 -05:00
Nick Mathewson 1cd40f532e Merge branch 'maint-0.3.5' into release-0.3.5 2020-11-12 08:13:37 -05:00
Nick Mathewson 862c44e4ec Bump to 0.3.5.12-dev 2020-11-12 08:11:01 -05:00
Nick Mathewson a0b827eb5b Copy 0.3.5.12 changelog to releasenotes. tor-0.3.5.12 2020-11-12 07:34:52 -05:00
Nick Mathewson 73b1d93d75 Merge branch 'maint-0.3.5' into release-0.3.5 2020-11-09 17:14:58 -05:00
Nick Mathewson 665083be9f Bump to 0.3.5.12 2020-11-09 17:12:18 -05:00
Nick Mathewson 412da7c85c Changelog for 0.3.5.12 2020-11-09 17:04:08 -05:00
Nick Mathewson ec9d646923 Merge branch 'maint-0.3.5' into release-0.3.5 2020-11-09 16:13:42 -05:00
Nick Mathewson 52e439c13e Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5 2020-11-09 16:13:24 -05:00
Nick Mathewson 31a6a101a0 Handle a change in the implementation of hashlib in Python 3.9
Previously, hashlib.shake_256 was a class (if present); now it can
also be a function.  This change invalidated our old
compatibility/workaround code, and made one of our tests fail.

Fixes bug 40179; bugfix on 0.3.1.6-rc when the workaround code was
added.
2020-11-05 09:34:36 -05:00
Alexander Færøy 55b8eedba8 Merge branch 'maint-0.3.5' into release-0.3.5 2020-10-28 15:17:51 +00:00
Nick Mathewson c48d25ac8d Fix a previously overstrict log message check.
OpenSSL doesn't seem to report error locations in the same way as
before, which broke one of our tests.

Fixes bug 40170; bugfix on 0.2.8.1-alpha.
2020-10-28 10:47:39 -04:00
Nick Mathewson 59f76a8a1f Changes file for #40165 (openssl deprecation warnings) 2020-10-28 10:34:22 -04:00
Nick Mathewson 2b4a3d07b2 Do not define OPENSSL_VERSION in compat_openssl.h
Apparently it conflicts with definitions elsewhere in Openssl 3.0.0.
2020-10-28 10:32:06 -04:00
Nick Mathewson e399d32cdf configure: disable OpenSSL deprecation warnings with OpenSSL >= 3
We can't do this in the C headers, since by the time we include
`opensslv.h` in order to check the openssl version number, we will
have included `openssl/macros.h`, which is the thing that checks
whether we disabled deprecation warnings.
2020-10-28 10:30:24 -04:00
Nick Mathewson d9221968ce Include a more modest openssl header in crypto_openssl_mgt.h
The "engines.h" header has lots of stuff; the "opensslv.h" header
has the version number, which is all we actually need here.

We need to do this because we're about to change this header to
conditionally define OPENSSL_SUPPRESS_DEPRECATED, and it would be
too late to do so if we'd already included "engines.h".
2020-10-28 10:11:42 -04:00
Nick Mathewson dd63b97288 Implement proposal 318: Limit protovers to 0..63
In brief: we go through a lot of gymnastics to handle huge protover
numbers, but after years of development we're not even close to 10
for any of our current versions.  We also have a convenient
workaround available in case we ever run out of protocols: if (for
example) we someday need Link=64, we can just add Link2=0 or
something.

This patch is a minimal patch to change tor's behavior; it doesn't
take advantage of the new restrictions.

Implements #40133 and proposal 318.
2020-10-14 11:28:37 -04:00
Nick Mathewson 58b23b33e4 Merge branch 'maint-0.3.5' into release-0.3.5 2020-10-07 09:29:17 -04:00
Nick Mathewson 741edf1b45 Merge remote-tracking branch 'tor-github/pr/1827/head' into maint-0.3.5 2020-10-07 09:29:07 -04:00
Nick Mathewson c80052f603 Merge branch 'maint-0.3.5' into release-0.3.5 2020-10-07 08:38:30 -04:00
David Goulet b404f085ad hs-v2: Add deprecation warning for service
If at least one service is configured as a version 2, a log warning is emitted
once and only once.

Closes #40003

Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-10-07 08:38:23 -04:00
Nick Mathewson c18d0b378c Merge branch 'maint-0.3.5' into release-0.3.5 2020-10-07 08:29:31 -04:00
Nick Mathewson 5f5587ee50 Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5 2020-10-07 08:29:23 -04:00
Nick Mathewson 0343ec056e Merge branch 'maint-0.3.5' into release-0.3.5 2020-10-07 08:26:04 -04:00
Nick Mathewson ad7ffa5240 Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5 2020-10-07 08:25:55 -04:00
Nick Mathewson 3fe253e6e1 Merge branch 'maint-0.3.5' into release-0.3.5 2020-10-07 08:16:19 -04:00
Nick Mathewson 98e14720b5 Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5 2020-10-07 08:14:46 -04:00
Nick Mathewson c3845263fe Merge branch 'maint-0.3.5' into release-0.3.5 2020-10-07 08:10:08 -04:00
Nick Mathewson 968b6c30c1 Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5 2020-10-07 08:09:59 -04:00
Nick Mathewson 3144e2ce2d Merge branch 'maint-0.3.5' into release-0.3.5 2020-10-07 08:08:01 -04:00
Nick Mathewson e0e0ef713e Merge remote-tracking branch 'tor-gitlab/mr/137' into maint-0.3.5 2020-10-07 08:07:53 -04:00