cf6e72b702
hs: Fix ADD_ONION with client authorization
...
Turns out that passing client authorization keys to ADD_ONION for v3 was
not working because we were not setting the "is_client_auth_enabled"
flag to true once the clients were configured. This lead to the
descriptor being encoded without the clients.
This patch removes that flag and instead adds an inline function that
can be used to check if a given service has client authorization
enabled.
This will be much less error prone of needing to keep in sync the client
list and a flag instead.
Fixes #40378
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-05-04 10:37:26 -04:00
8d0d7a665a
Remove NEED_SKEY_1024 parsing.
...
Only v2 onion services needed this, and they are now gone.
Closes #40374 .
2021-04-23 15:55:51 -04:00
1d18ecbc5f
Remove HSv2 leftovers after merging #18346
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-23 12:54:10 -04:00
3bd7367274
Merge branch 'tor-gitlab/mr/327'
...
Conflicts:
src/test/test.c
Minor comment issue.
2021-04-23 12:48:55 -04:00
973fcf056a
Merge branch 'maint-0.4.6'
2021-04-23 13:00:24 +03:00
f0260c4cea
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-04-23 13:00:23 +03:00
8c29729916
hs: Fix memory leak in client cache
...
Fixes #40356
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-21 11:37:46 -04:00
fe9bd6bd96
Merge branch 'maint-0.4.6'
2021-04-21 10:34:28 -04:00
38bfb3cdfe
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-04-21 10:34:28 -04:00
a4a3721690
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-04-21 10:34:28 -04:00
87d96f7162
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-21 10:34:14 -04:00
32eea3b006
Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5
2021-04-21 16:48:22 +03:00
cbf71c4fa7
Merge branch 'maint-0.4.6'
2021-04-19 11:43:39 -04:00
0ceacb5482
Merge branch 'mr_347_squashed' into maint-0.4.6
2021-04-19 11:40:44 -04:00
6281c90885
relay: Emit log warning if Address is internal and can't be used
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-19 11:40:30 -04:00
07237b484e
Merge remote-tracking branch 'jigsaw/fix-40317_046-saveconf-sandbox-one-backup'
2021-04-19 11:32:21 -04:00
d162b98548
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-04-19 11:30:00 -04:00
de33be6e32
Merge branch 'maint-0.4.6'
2021-04-19 11:30:00 -04:00
cd75eac743
Tweak changes/ticket40369 to be a bug.
2021-04-19 11:29:46 -04:00
f47c6c3d1b
scripts/build/combine_libs: use $AR rather than ar
...
Using a custom ar at $AR may be necessary for cross-compilation.
Closes #40369
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-19 11:28:20 -04:00
7080e748e5
Merge remote-tracking branch 'tor-gitlab/mr/364'
2021-04-19 17:38:16 +03:00
461a3c732b
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-04-19 17:33:46 +03:00
874d2c8601
Merge branch 'maint-0.4.6'
2021-04-19 17:33:46 +03:00
925ec0e0ea
Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5
2021-04-19 17:32:56 +03:00
f20f5a4e37
Stop calling evdns_set_random_bytes_fn()
...
This function has been a no-op since Libevent 2.0.4-alpha, when
libevent got an arc4random() implementation. Libevent has finally
removed it, which will break our compilation unless we stop calling
it. (This is currently breaking compilation in OSS-fuzz.)
Closes #40371 .
2021-04-16 17:26:59 -04:00
e7c407d927
Bump to 0.4.7.0-alpha-dev
2021-04-15 12:44:26 -04:00
8f78243fc3
Merge branch 'maint-0.4.6'
...
"ours" to avoid version bump.
2021-04-15 12:42:33 -04:00
e6d9dd9157
Bump to 0.4.6.2-alpha-dev
2021-04-15 12:42:23 -04:00
d6ebd8160d
Add 0.4.6 to git-list-tor-branches.sh
2021-04-15 12:40:45 -04:00
284f445248
two more changelog fixes from arma
2021-04-14 15:22:26 -04:00
c5f84ce6a3
changelog edits from arma
2021-04-14 15:15:15 -04:00
943d4834af
light changelog edits
2021-04-14 14:24:32 -04:00
33ca927a8e
Start a changes file for 0.4.6.2-alpha
2021-04-14 10:58:15 -04:00
96d4466488
Bump version to 0.4.6.2-alpha.
2021-04-14 10:55:48 -04:00
e71154428e
geoip script: add options to output AS numbers.
...
The --include-asn option includes AS numbers in the geoip mapping.
The --output-asn option makes the program generate a number-to-name
mapping file.
Additionally, the script now outputs ?? CC entries for networks that
are listed but which have no country known.
2021-04-14 10:28:44 -04:00
91569c4dad
Merge branch 'maint-0.4.5'
2021-04-14 08:39:17 -04:00
bba3393d20
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-14 08:39:16 -04:00
30fa80c0fc
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-04-14 08:39:16 -04:00
131e2d99a4
fallbackdir: Remove two unspec lines
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-14 08:39:04 -04:00
5e6905ed99
Fix test naming, and fix tests on windows.
...
This is a bugfix against my fix for #40133 , which has not yet
appeared in 0.3.5.
2021-04-13 17:38:31 -04:00
8b22c80f56
Clean up the CONNECTION_TESTCASE_ARG macro.
2021-04-13 17:34:03 -04:00
2815721243
Merge branch 'maint-0.4.5'
2021-04-13 17:00:56 -04:00
59bc377dce
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-04-13 16:59:16 -04:00
59f6248e09
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-13 16:59:15 -04:00
ee7c50b8a7
fallbackdir: Renegerate list with 200 relays
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-13 15:15:58 -04:00
705ea32c6e
relay: Move "overload-general" from extra-info to server descriptor.
...
Fixes #40364
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-04-13 15:11:03 -04:00
1f21b6e6a7
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-04-13 10:36:01 -04:00
1b48a28a74
Merge branch 'maint-0.4.5'
2021-04-13 10:36:01 -04:00
b323e6b8c2
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-13 10:36:00 -04:00
32f5ad7665
Update geoip files to match ipfire location db, 2021/04/13.
2021-04-13 10:35:50 -04:00
David Goulet
Nick Mathewson
George Kadianakis
Emery Hemingway
Alexander Færøy