Commit Graph

37517 Commits

Author SHA1 Message Date
David Goulet fd640bbeae Merge branch 'maint-0.4.6' into release-0.4.6 2021-10-06 13:25:08 -04:00
David Goulet 82b7939d19 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-06 13:25:02 -04:00
David Goulet 602dcd8e37 hs-v2: Only log once the connection warning to v2
Closes #40474

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-06 13:22:02 -04:00
David Goulet f0d1240a07 hs-v2: Only log once the connection warning to v2
Closes #40474

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-06 13:20:22 -04:00
David Goulet fb7c832597 Merge branch 'maint-0.4.6' into release-0.4.6 2021-09-13 13:34:48 -04:00
David Goulet f728e09ebe Merge branch 'maint-0.4.5' into maint-0.4.6 2021-09-13 13:34:48 -04:00
David Goulet 0dbb2f53b9 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-09-13 13:34:44 -04:00
Alexander Færøy fcef8e3f75 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-09-13 18:33:27 +02:00
Alexander Færøy 12b64845ae Use Debian bullseye for our hardened build. 2021-09-13 18:13:10 +02:00
Alexander Færøy 84d6f977e7 Force amd64 for CI builds. 2021-09-13 18:08:49 +02:00
David Goulet 7456f6d777 Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-16 16:34:52 -04:00
David Goulet 2be49cdbe5 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-08-16 16:34:39 -04:00
David Goulet e3382afccd Bump version to -dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-16 16:34:33 -04:00
David Goulet da9ff3936d Merge branch 'maint-0.3.5' into maint-0.4.5 2021-08-16 16:34:19 -04:00
David Goulet 18f2a7c012 Bump version to -dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-16 16:34:10 -04:00
David Goulet a8ce645ab0 Bump version to -dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-16 16:33:58 -04:00
David Goulet 31728f4ad3 changelog: Run format_changelog.py
Signed-off-by: David Goulet <dgoulet@torproject.org>
tor-0.4.6.7
2021-08-16 15:26:18 -04:00
David Goulet fde7ffb13f changelog: Update with security fix stanza
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-16 11:54:01 -04:00
Alexander Færøy 46ad2240de Merge branch 'maint-0.4.5' into maint-0.4.6 2021-08-16 15:28:22 +00:00
Alexander Færøy 1f76b3cce7 Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-16 15:28:22 +00:00
Alexander Færøy 903c578119 Always teardown capture of logs in CAPTURE().
This will hopefully solve an issue where our gmtime related tests are
failing on 32-bit builds.
2021-08-16 15:27:38 +00:00
Alexander Færøy d1c781e67e Merge branch 'maint-0.4.5' into maint-0.4.6 2021-08-16 13:58:32 +00:00
Alexander Færøy dafed93ccd Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-16 13:58:32 +00:00
Alexander Færøy 78712990ab Merge branch 'maint-0.3.5' into maint-0.4.5 2021-08-16 13:58:32 +00:00
Alexander Færøy b07cd2ee90 Use debian:buster instead of debian:stable for now. 2021-08-16 13:57:56 +00:00
Nick Mathewson 6a01c34bb8 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-08-16 09:51:27 -04:00
Nick Mathewson 078782e0d1 Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-16 09:51:27 -04:00
Nick Mathewson b2d6fed3e9 Disable message checking for some 32-bit tests about timegm failure.
Since we merged 40383, we don't expect these to give the same
warning on every platform.
2021-08-16 09:48:08 -04:00
Nick Mathewson 8f6513d54f Use the correct release date. 2021-08-16 08:25:00 -04:00
Nick Mathewson c4531dc02e Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-16 08:21:28 -04:00
Nick Mathewson fd38609ae2 Make the version 0.4.6.7, not 0.4.6.7-dev. 2021-08-16 08:21:04 -04:00
Nick Mathewson df6a92dcc3 Merge branch 'maint-0.4.5' into maint-0.4.6
"ours" to avoid version bump
2021-08-16 08:19:17 -04:00
Nick Mathewson 1ec4c7b34a Make the version 0.4.5.10, not 0.4.5.10-dev. 2021-08-16 08:18:57 -04:00
Nick Mathewson 1667e122de Merge branch 'maint-0.3.5' into maint-0.4.5
"ours" to avoid version bump
2021-08-16 08:18:09 -04:00
Nick Mathewson 2984fba97a Make the version 0.3.6.16, not 0.3.6.16-dev. 2021-08-16 08:17:59 -04:00
David Goulet 2a5430a4dd Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-13 09:48:51 -04:00
David Goulet 70e249123a Merge branch 'maint-0.4.5' into maint-0.4.6 2021-08-13 09:46:31 -04:00
David Goulet ca249131b0 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-08-13 09:44:53 -04:00
David Goulet 041a0a362f Update version to 0.3.5.16
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-13 09:43:44 -04:00
David Goulet 685b3e4383 Update version to 0.4.5.10
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-13 09:42:52 -04:00
David Goulet 07c417b207 Update version to 0.4.6.7
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-13 09:42:26 -04:00
David Goulet 04b0f78f43 Changelog for 0.4.6.7
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-08-13 09:39:16 -04:00
David Goulet 4c3c40e70c Merge branch 'maint-0.4.5' into maint-0.4.6 2021-08-12 12:13:26 -04:00
David Goulet 0233b06f28 Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-12 12:13:26 -04:00
David Goulet 33abeeab94 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-08-12 12:13:25 -04:00
Alexander Færøy eca5b62213 Update GeoIP files to match IPFire location DB as per 2021/08/12. 2021-08-12 15:38:11 +00:00
Alexander Færøy b8660e384f Merge branch 'maint-0.4.5' into maint-0.4.6 2021-08-11 13:15:59 +00:00
Alexander Færøy 053c4578de Merge branch 'maint-0.4.6' into release-0.4.6 2021-08-11 13:15:59 +00:00
Alexander Færøy 81635ec577 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-08-11 13:15:58 +00:00
Alexander Færøy 7e0971d868 Merge remote-tracking branch 'tor-gitlab/mr/417' into maint-0.3.5 2021-08-11 13:15:35 +00:00