Commit Graph

38963 Commits

Author SHA1 Message Date
David Goulet
5aa5463990 Merge branch 'maint-0.4.8' 2023-08-30 08:40:50 -04:00
David Goulet
9c79442a80 script: Attempt to fix geoip script
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-30 08:40:44 -04:00
David Goulet
c8844bc929 Merge branch 'maint-0.4.8' 2023-08-28 14:08:43 -04:00
David Goulet
3aa937dd5e Merge branch 'tor-gitlab/mr/750' into maint-0.4.8 2023-08-28 14:08:39 -04:00
David Goulet
4a1815e4cb Merge branch 'maint-0.4.8' 2023-08-28 14:07:47 -04:00
Micah Elizabeth Scott
532543e84a Changes files for 40843 and 40844 (NetBSD portability) 2023-08-28 10:11:00 -07:00
Micah Elizabeth Scott
a3e7e9bda2 equix: Disable huge page support by default
Equi-X supports optionally allocating its solver memory using huge
pages, to reduce the virtual memory subsystem overhead required to make
the entire solver buffer live.

Tor doesn't use this feature, since it seems to have no noticeable
performance benefit at this time, but we still included code for it at
compile time. To improve portability, this patch disables huge page
support by default and enables it only in the cmake build system used
for equix benchmarks.

With this patch equix-bench still supports huge pages. Verified using
strace that we're making the hugepage allocation.

There's no fallback for huge pages, so Equi-X initialization will fail
if they are requested and we don't support them for any runtime or
compile-time reason.

Addresses #40843 (NetBSD) but also prevents future porting issues
related to huge pages.
2023-08-28 10:11:00 -07:00
Micah Elizabeth Scott
95e8ffa97e hashx: Fix compiled hash function on NetBSD
NetBSD includes the idea of a 'maximum protection' per-region,
and an mprotect which exceeds the max protection will be denied.

If we explicitly ask for a maximum which includes execute permission, we
can successfully swap our code buffer's permissions between read-write
and read-execute when each hash program is compiled.

With this patch, the crypto/hashx tests pass on NetBSD 9.
This addresses bug #40844
2023-08-28 10:11:00 -07:00
Micah Elizabeth Scott
ee4e9f7506 hashx: Avoid unused arg warning on OpenBSD and NetBSD
This path in hashx_vm_alloc_huge() for OpenBSD and NetBSD always
fails without checking its parameter. Fix the warning.
2023-08-28 10:11:00 -07:00
Micah Elizabeth Scott
9cac0a85b4 equix: Add NetBSD to "huge pages not supported" path
As suggested by @wiz on #40843, let's add an explicit check to
hashx_vm_alloc_huge() that avoids using a Linux-style default
on NetBSD targets.

This doesn't change the questionable Linux-style default,
but a future patch will disable this code by default so it's not a
portability liability.

(This code is in hashx's VM layer but it's actually only relevant to
equix.)

This addresses bug #40843. Another patch will disable huge pages
by default entirely, but this patch is sufficient to fix the NetBSD
build.
2023-08-28 10:11:00 -07:00
Mike Perry
888da0579d Changes file for bug40842 2023-08-28 13:50:44 +00:00
Mike Perry
7666dd777a Bug #40842: Additional diagnostics
Just in case there are other instances hiding in the maze.
2023-08-25 22:53:07 +00:00
Mike Perry
fd6f098c9d Bug #40842: Don't send on sets that are being torn down 2023-08-25 22:45:07 +00:00
David Goulet
aeb2e24a75 Merge branch 'maint-0.4.8' 2023-08-25 12:56:45 -04:00
David Goulet
4119a7f971 Merge branch 'tor-gitlab/mr/748' into maint-0.4.8 2023-08-25 12:56:42 -04:00
David Goulet
4f21fc0fe4 Merge branch 'reapply-exit-policy-on-reload' into 'main'
reapply exit policy on reload

Closes #40676

See merge request tpo/core/tor!735
2023-08-25 16:55:40 +00:00
David Goulet
99a19a0da6 Merge branch 'no_consensus_on_package_lines' into 'main'
Implement proposal 301-dont-vote-on-package-fingerprints.txt

See merge request tpo/core/tor!743
2023-08-25 16:54:54 +00:00
David Goulet
e13a4b3a69 Merge branch 'maint-0.4.8' 2023-08-25 12:53:21 -04:00
trinity-1686a
73930bda48 fix lint clippy::arc_with_non_send_sync 2023-08-25 12:53:17 -04:00
David Goulet
ed6186631b Merge branch 'tor-gitlab/mr/746' 2023-08-25 12:52:22 -04:00
David Goulet
47c329902d Merge branch 'rust-lint-1.72' into 'main'
fix lint clippy::arc_with_non_send_sync

See merge request tpo/core/tor!747
2023-08-25 16:50:30 +00:00
Mike Perry
91b16d34bd Changes file for bug40841 2023-08-25 16:32:59 +00:00
Mike Perry
380727a16d Bug #40841: Demote extra legs to protocol warn.
Also add more info to leg dump.
2023-08-25 16:32:59 +00:00
trinity-1686a
453c8b46d3 fix lint clippy::arc_with_non_send_sync 2023-08-25 10:30:03 +02:00
trinity-1686a
9bc241f8ec use physical runner for i386 jobs 2023-08-25 10:14:04 +02:00
David Goulet
08e575463a Merge branch 'maint-0.4.8' 2023-08-23 17:02:41 -04:00
David Goulet
97d3cf3950 doxygen: Typo fix in relay.c comment
HTML in comment, what a bad idea...

Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 17:02:25 -04:00
David Goulet
2bfad42318 Merge branch 'maint-0.4.8' 2023-08-23 16:41:42 -04:00
David Goulet
c56ba686d6 typo: Fix a doxygen html unclosed tag
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 16:41:36 -04:00
David Goulet
2fd8944e8a Merge branch 'maint-0.4.8' 2023-08-23 12:50:05 -04:00
David Goulet
0e745d561d Merge branch 'maint-0.4.7' into maint-0.4.8 2023-08-23 12:50:05 -04:00
David Goulet
cf98f4d7b3 ci: Exclude yet another failing Stem test
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 12:49:53 -04:00
David Goulet
0c07d68a2b Merge branch 'maint-0.4.8' 2023-08-23 12:33:28 -04:00
David Goulet
eeef1ef735 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-08-23 12:33:28 -04:00
David Goulet
e553a24281 ci: Missing stem cmdline flag in previous commit
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 12:33:23 -04:00
David Goulet
bf91c4a397 Merge branch 'maint-0.4.8' 2023-08-23 11:34:02 -04:00
David Goulet
42574bfd6e Merge branch 'maint-0.4.7' into maint-0.4.8 2023-08-23 11:34:02 -04:00
David Goulet
405c57769f ci: Exclude broken Stem tests
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 11:33:58 -04:00
David Goulet
e73e7b8931 ci: Exclude broken Stem tests
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 11:33:43 -04:00
David Goulet
f332006a53 version: Bump to 0.4.9.0-alpha-dev
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 11:19:52 -04:00
David Goulet
82a5297d99 scripts: Add 048 maint branch to our helper scripts
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 11:06:16 -04:00
Tor CI Release
6d6bd21b9d version: Bump version to 0.4.8.4 2023-08-23 10:16:00 -04:00
David Goulet
51cefce3e6 ChangeLog and ReleaseNotes for 0.4.8.4 stable
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-23 10:12:54 -04:00
Tor CI Release
10636f84e8 fallbackdir: Update list generated on August 23, 2023 2023-08-23 09:21:47 -04:00
Tor CI Release
56008b623f Update geoip files to match ipfire location db, 2023/08/23. 2023-08-23 09:21:43 -04:00
David Goulet
c3bc04e355 Fix compilation errors for FreeBSD
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-22 13:37:25 -04:00
David Goulet
554d840742 changes: Add changes file for ticket 40833
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-22 13:25:34 -04:00
David Goulet
c6b1da20a7 Merge remote-tracking branch 'mbeth-private/ticket40833_mr' 2023-08-22 13:24:00 -04:00
David Goulet
3487a0d696 changes: Add changes file for ticket 40821
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-08-22 13:11:37 -04:00
David Goulet
e39fb0962f Merge remote-tracking branch 'mbeth-private/ticket40821_mr' 2023-08-22 13:09:54 -04:00