Commit Graph

37425 Commits

Author SHA1 Message Date
Alexander Færøy
fb6bba1e42 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-11-05 03:10:29 +00:00
Alexander Færøy
40e2106031 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-11-05 03:10:28 +00:00
Alexander Færøy
cfd1482f78 Merge remote-tracking branch 'ahf/ahf/ci-i386' into maint-0.3.5 2021-11-05 03:10:12 +00:00
David Goulet
33fb0f1d8f shellcheck: Remove unused variable in ci-driver.sh
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-11-03 09:54:09 -04:00
David Goulet
83f8fe05e8 Merge branch 'maint-0.4.5' into maint-0.4.6
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-11-03 09:53:31 -04:00
David Goulet
ea5eebf431 Merge branch 'tor-gitlab/mr/477' into maint-0.4.5 2021-11-03 09:52:03 -04:00
David Goulet
6e8e1a4e6f relay: Don't allow DirPort on non-IPv4
Our code doesn't allow it and so this prevents an assert() crash if the
DirPort is for instance IPv6 only.

Fixes #40494

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-11-03 09:51:46 -04:00
David Goulet
621f8ac418 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-11-03 09:47:43 -04:00
David Goulet
1e3e921d7d Merge branch 'maint-0.3.5' into maint-0.4.5 2021-11-03 09:47:43 -04:00
David Goulet
1902edaf52 shellcheck: Make it happy on couple scripts
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-11-03 09:47:30 -04:00
Alexander Færøy
d83c6bf80f Add i386 version of debian-minimal for 32-bit Gitlab CI builds.
See: tpo/core/tor#40505
2021-11-03 12:36:30 +00:00
Alexander Færøy
9922116388 Add missing ponctuation. 2021-11-02 15:26:09 +00:00
David Goulet
6926c9192a man: Missing OverloadStatistics option in tor.1
Closes #40504

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-11-02 09:51:43 -04:00
Alexander Færøy
77f5bfa60e Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-29 16:56:33 +00:00
Alexander Færøy
57f296b396 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-29 16:56:33 +00:00
Alexander Færøy
5c8deef9b6 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-10-29 16:52:18 +00:00
David Goulet
3ebf217009 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-29 09:20:21 -04:00
David Goulet
77c47417f2 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-29 09:20:21 -04:00
David Goulet
f5bd575401 changes: Add file for ticket 26299
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-29 09:19:59 -04:00
David Goulet
92fedb9f44 changes: Add file for ticket 26299
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-29 09:19:21 -04:00
David Goulet
8da8105ee2 makefile: Add a reproducible dist make job
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 16:29:37 -04:00
David Goulet
8cf6f9183c makefile: Add a reproducible dist make job
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 16:29:22 -04:00
Alexander Færøy
11fedab9ce release: Patches to make tarball reproducible
Closes #26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 14:31:52 -04:00
David Goulet
5363d9b118 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-28 14:26:35 -04:00
David Goulet
a80868c118 changes: Typo in file, wrong version was used
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 14:22:14 -04:00
Alexander Færøy
d37273be0d release: Patches to make tarball reproducible
Closes #26299

Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 13:42:02 -04:00
David Goulet
89073bda5f Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-28 10:38:20 -04:00
Alexander Færøy
31fa3cc1a0 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-10-28 10:37:45 -04:00
David Goulet
fa405ca27f Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-28 09:42:32 -04:00
David Goulet
7c4fd150cd Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-28 09:42:25 -04:00
David Goulet
27caad6f5c version: Missing version update in couple files
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 09:41:56 -04:00
David Goulet
97c976778a version: Missing version update in couple files
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 09:41:13 -04:00
David Goulet
fa438b6cf0 version: Missing version update in couple files
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-28 09:40:50 -04:00
David Goulet
61aed5200c Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-26 14:33:49 -04:00
David Goulet
ae92a92453 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-26 14:33:49 -04:00
David Goulet
14385ce71e ci: Missing source dir when parsing configure.ac version
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 14:33:31 -04:00
David Goulet
90a74a2ea8 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-26 11:31:28 -04:00
David Goulet
d672cc6e47 version: Bump to 0.4.6.8-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 11:31:24 -04:00
David Goulet
d4af7bdb26 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-26 11:31:14 -04:00
David Goulet
00ff6dffa1 version: Bump to 0.4.5.11-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 11:31:06 -04:00
David Goulet
66193ee708 version: Bump to 0.3.5.17-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 11:30:56 -04:00
David Goulet
fadb57e853 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-26 09:17:58 -04:00
David Goulet
6f776001cb Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-26 09:17:52 -04:00
David Goulet
a647c26a6b version: Bump to 0.4.6.8
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 09:17:01 -04:00
David Goulet
446135aff0 version: Bump to 0.4.5.11
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 09:16:44 -04:00
David Goulet
9280f32fc0 version: Bump to 0.3.5.17
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-26 09:16:17 -04:00
Alexander Færøy
0c5128eeb2 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-25 21:02:55 +00:00
David Goulet
12c3787305 ci: Exclude HSv2 Stem tests
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-10-25 20:56:26 +00:00
David Goulet
d496a75026 Merge branch 'maint-0.4.5' into maint-0.4.6 2021-10-21 10:01:38 -04:00
David Goulet
1dab1c8ad5 Merge branch 'maint-0.3.5' into maint-0.4.5 2021-10-21 10:01:38 -04:00