Commit Graph

38824 Commits

Author SHA1 Message Date
Alexander Færøy
a8b573a322 Add changes file for tpo/core/tor#40487 (and its MR's). 2023-09-13 18:39:55 +02:00
Alexander Færøy
22f0246932 Merge remote-tracking branch 'upstream/merge-requests/493' into ahf/android-gp-fixes-bulk 2023-09-13 18:29:54 +02:00
Alexander Færøy
1cf796d3b4 Merge remote-tracking branch 'upstream/merge-requests/460' into ahf/android-gp-fixes-bulk 2023-09-13 18:29:38 +02:00
David Goulet
7f626f5577 Merge branch 'libressl-3.8.1' into 'main'
crypt_openssl_mgt: define DISABLE_ENGINES after OPENSSL_NO_ENGINE

See merge request tpo/core/tor!754
2023-09-12 14:32:03 +00:00
David Goulet
9f2d3e7750 Merge branch 'cell_comment' into 'main'
Correct a comment on channel_should_write_to_kernel.

See merge request tpo/core/tor!757
2023-09-12 14:31:08 +00:00
David Goulet
2cecf046bb Merge branch 'maint-0.4.8' 2023-09-12 10:28:42 -04:00
Nick Mathewson
d6c89b1ae1 Make networkstatus_getinfo_by_purpose report published_on again.
When we implemented prop275 in 0.4.8.1-alpha, we changed the
behavior of networkstatus_getinfo_helper_single to omit meaningful
published_on times, replacing them with "2038-01-01".  This is
necessary when we're formatting a routerstatus with no additional
info, since routerstatus objects no longer include a published_on.

But in networkstatus_getinfo_by_purpose, we do have a routerinfo
that does have a published_on.  This patch uses that information
to report published_on times in our output when we're making a
"virtual" networkstatus for a big file of routerinfo_t objects.
This is mostly important for bridge authorities, since when
they dump a secret list of the bridges, they want to include
published_on times.

Closes #40855. Bugfix on 0.4.8.1-alpha.
2023-09-12 08:46:31 -04:00
Nick Mathewson
1da5a9b3bc Correct a comment on channel_should_write_to_kernel.
This issue was originally called out by pseudonymisaTor on !707; the comment in
this commit takes a different approach to explaining what is going on.
2023-09-12 08:24:29 -04:00
Alexander Færøy
449f988c8f Merge branch 'typos' into 'main'
fix two simple typos in comments

See merge request tpo/core/tor!755
2023-09-06 11:17:48 +00:00
Roger Dingledine
41f3296180 fix two simple typos in comments 2023-09-05 16:06:54 -04:00
orbea
48f8d69189 crypt_openssl_mgt: define DISABLE_ENGINES after OPENSSL_NO_ENGINE
With LibreSSL-3.8.1 these engines are no long available causing a build
failure, but LibreSSL correctly defines OPENSSL_NO_ENGINE as part of its
opensslfeatures.h. However Tor includes crypto_openssl_mgt.h before any
of the openssl includes which would define OPENSSL_NO_ENGINE and then
fails to define DISABLE_ENGINES.

As the define is used in only a single .c file it is best to move it
there.

Signed-off-by: orbea <orbea@riseup.net>
2023-08-31 14:38:15 -07:00
David Goulet
3b17635f46 Merge branch 'maint-0.4.8' 2023-08-30 13:35:57 -04:00
Tor CI Release
89148fbffe version: Bump version to 0.4.8.5-dev 2023-08-30 13:35:50 -04:00
David Goulet
fbc3020209 Merge branch 'maint-0.4.8' 2023-08-30 08:58:55 -04:00
Tor CI Release
d7754c77bc version: Bump version to 0.4.8.5 2023-08-30 08:58:40 -04:00
David Goulet
cc52d8651f Merge branch 'maint-0.4.8' 2023-08-30 08:49:51 -04:00
Tor CI Release
1f88c76848 fallbackdir: Update list generated on August 30, 2023 2023-08-30 08:47:17 -04:00
Tor CI Release
9254028b38 Update geoip files to match ipfire location db, 2023/08/30. 2023-08-30 08:47:12 -04:00
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