Commit Graph

38859 Commits

Author SHA1 Message Date
David Goulet
1835f6ef5b Merge branch 'maint-0.4.8' 2023-09-18 09:27:38 -04:00
David Goulet
267c5e0235 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:27:34 -04:00
David Goulet
5e961007db geoip: Match maint-0.4.8 files for release
Signed-off-by: David Goulet <dgoulet@torproject.org>
2023-09-18 09:27:20 -04:00
David Goulet
ca9ca6da04 Merge branch 'sandbox-aarch64-riscv-fixes' into 'main'
Fix sandbox on AArch64, RISC-V

Closes #24454

See merge request tpo/core/tor!446
2023-09-18 13:14:51 +00:00
David Goulet
7278c1554d Merge branch 'ahf/android-gp-fixes-bulk' into 'main'
Bulk Android path changes

Closes #40487

See merge request tpo/core/tor!762
2023-09-18 13:12:36 +00:00
David Goulet
8425e1e575 Merge branch 'maint-0.4.8' 2023-09-18 09:11:06 -04:00
David Goulet
2c8430cb2f Merge branch 'tor-gitlab/mr/759' into maint-0.4.8 2023-09-18 09:11:02 -04:00
David Goulet
fada3c0d02 Merge branch 'maint-0.4.8' 2023-09-18 09:10:44 -04:00
David Goulet
cd2bc94c44 Merge branch 'tor-gitlab/mr/761' into maint-0.4.8 2023-09-18 09:10:39 -04:00
David Goulet
825f4ca479 Merge branch 'maint-0.4.8' 2023-09-18 09:08:57 -04:00
David Goulet
c24203cf31 Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:08:57 -04:00
David Goulet
6a73836e08 Merge branch 'tor-gitlab/mr/766' into maint-0.4.7 2023-09-18 09:08:52 -04:00
David Goulet
ac6bd88912 Merge branch 'maint-0.4.8' 2023-09-18 09:08:17 -04:00
David Goulet
5a2f46a7ba Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:08:17 -04:00
David Goulet
c0a10b259c Merge branch 'tor-gitlab/mr/764' into maint-0.4.7 2023-09-18 09:08:13 -04:00
David Goulet
8133c2a93c Merge branch 'maint-0.4.8' 2023-09-18 09:06:04 -04:00
David Goulet
91900d1dae Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-18 09:06:01 -04:00
David Goulet
bb44a0a544 Merge branch 'tor-gitlab/mr/765' into maint-0.4.7 2023-09-18 09:05:42 -04:00
trinity-1686a
890c31ceba use physical runner for i386 jobs 2023-09-18 15:05:00 +02:00
Alexander Færøy
3a5bf0f5e6 Add changes file for tor#40859. 2023-09-14 22:43:12 +02:00
Alexander Færøy
3d160b37c2 Lower the log-level and soften the language for our Zstd ABI compat check.
See: tpo/core/tor#40815.
2023-09-14 22:26:41 +02:00
Alex Xu (Hello71)
d1fb8fb32a ci-driver: fix running doxygen and stem tests on 0.4.8
also do some cleanup, no point to set TOR_VER_AT_LEAST_043 and
TOR_VER_AT_LEAST_044 variables which are always yes
2023-09-14 21:55:20 +02:00
David Goulet
c884a07f08 Merge branch 'maint-0.4.8' 2023-09-14 15:34:26 -04:00
David Goulet
fff805c7dd Merge branch 'maint-0.4.7' into maint-0.4.8 2023-09-14 15:34:25 -04:00
Mike Perry
8fc589f564 Changes file for bug40858 2023-09-14 19:18:15 +00:00
Mike Perry
ee0797bf0e Bug 40858: Cache sendme_inc to avoid purging intro points.
Bug found and fixed by @hyunsoo.kim676.
2023-09-14 19:16:06 +00:00
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
Alexander Færøy
d9a6b37ab1 Add diagnostic log message for compression bombs.
This patch causes `tor_compress_is_compression_bomb()` to emit a
warning-level log message that lets us learn the potential ratio of the
input to output buffer sizes. Hopefully, this will give us a bit of a
better idea whether the compression bomb ratio needs some tuning.

See: tpo/core/tor#40739.
2023-09-13 16:13:28 +02:00
Alexander Færøy
87fb8b6417 Remove defensive assertion in relay_key_is_unavailable_().
This patch removes a call to `tor_assert_nonfatal_unreached()` in
`relay_key_is_unavailable_()` that is only called when Tor is compiled
without relay support.

Unfortunately, the non-fatal assertion causes a BUG log
message to appear for clients when they start up without relay support
for each CPU worker we spawn. This makes it spotting issues during
bootstrap harder particularly for our iOS developers.

Since the call sites to `get_master_identity_key()` handles `NULL`
values already, we do not think this will be an issue later on.

Reported by Benjamin Erhart (@tla) from Guardian Project.

Fixes tpo/core/tor#40848.
2023-09-12 16:42:35 +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