aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-09Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-11-09Merge remote-tracking branch 'tor-gitlab/mr/189' into maint-0.3.5Nick Mathewson
2020-11-05Make config/parse_tcp_proxy_line work in the presence of DNS hijackingNick Mathewson
We can use our existing mocking functionality to do this: We have been in this position before. Fixes part of #40179; bugfix on 0.4.3.1-alpha.
2020-11-05Handle a change in the implementation of hashlib in Python 3.9Nick Mathewson
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-10-28Merge branch 'maint-0.4.3' into release-0.4.3Alexander Færøy
2020-10-28Merge branch 'maint-0.3.5' into maint-0.4.3Alexander Færøy
2020-10-28Fix a previously overstrict log message check.Nick Mathewson
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-28Changes file for #40165 (openssl deprecation warnings)Nick Mathewson
2020-10-28Do not define OPENSSL_VERSION in compat_openssl.hNick Mathewson
Apparently it conflicts with definitions elsewhere in Openssl 3.0.0.
2020-10-28configure: disable OpenSSL deprecation warnings with OpenSSL >= 3Nick Mathewson
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-28Include a more modest openssl header in crypto_openssl_mgt.hNick Mathewson
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-14Implement proposal 318: Limit protovers to 0..63Nick Mathewson
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-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07Merge remote-tracking branch 'tor-github/pr/1827/head' into maint-0.3.5Nick Mathewson
2020-10-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07hs-v2: Add deprecation warning for serviceDavid Goulet
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-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Make HSFETCH take the decoded length into account, not the base32 oneNeel Chauhan
2020-10-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07Merge remote-tracking branch 'tor-gitlab/mr/77' into maint-0.3.5Nick Mathewson
2020-10-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07Merge remote-tracking branch 'tor-gitlab/mr/79' into maint-0.3.5Nick Mathewson
2020-10-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07Merge remote-tracking branch 'tor-github/pr/1661/head' into maint-0.3.5Nick Mathewson
2020-10-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07Merge remote-tracking branch 'tor-gitlab/mr/43' into maint-0.3.5Nick Mathewson
2020-10-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07Merge remote-tracking branch 'tor-gitlab/mr/137' into maint-0.3.5Nick Mathewson
2020-10-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07Merge remote-tracking branch 'tor-gitlab/mr/103' into maint-0.3.5Nick Mathewson
2020-10-07Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-10-07Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-10-07Merge branch 'mr_124_squashed' into maint-0.3.5Nick Mathewson
2020-10-07Parallelize src/test/test into chunks.Nick Mathewson
First, we introduce a flag to teach src/test/test to split its work into chunks. Then we replace our invocation of src/test/test in our "make check" target with a set of 8 scripts that invoke the first 8th of the tests, the second 8th, and so on. This change makes our "make -kj4 check" target in our hardened gitlab build more than twice as fast, since src/test/test was taking the longest to finish. Closes 40098.
2020-09-28Merge branch 'bug40133_035' into bug40133_043Nick Mathewson
2020-09-28Merge branch 'maint-0.3.5' into bug40133_035Nick Mathewson
2020-09-22Merge branch 'maint-0.4.3' into release-0.4.3David Goulet
2020-09-22Merge branch 'maint-0.3.5' into maint-0.4.3David Goulet
2020-09-22srv: Remove spammy debug logDavid Goulet
Fixes #40135 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-09-21Merge branch 'maint-0.4.3' into release-0.4.3Nick Mathewson
2020-09-21Merge branch 'maint-0.3.5' into maint-0.4.3Nick Mathewson
2020-09-21gitlab-ci: Use test-network-all for debian-integrationNick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion