Nick Mathewson
e4f2b52deb
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-05-07 13:08:25 -04:00
Nick Mathewson
d85ef0d5e0
Merge branch 'ticket40382_045' into maint-0.4.5
2021-05-07 13:08:14 -04:00
Nick Mathewson
f5acfe6723
Add a sandbox workaround for Glibc 2.33
...
This change permits the newfstatat() system call, and fixes issues
40382 (and 40381).
This isn't a free change. From the commit:
// Libc 2.33 uses this syscall to implement both fstat() and stat().
//
// The trouble is that to implement fstat(fd, &st), it calls:
// newfstatat(fs, "", &st, AT_EMPTY_PATH)
// We can't detect this usage in particular, because "" is a pointer
// we don't control. And we can't just look for AT_EMPTY_PATH, since
// AT_EMPTY_PATH only has effect when the path string is empty.
//
// So our only solution seems to be allowing all fstatat calls, which
// means that an attacker can stat() anything on the filesystem. That's
// not a great solution, but I can't find a better one.
2021-05-07 12:12:11 -04:00
Nick Mathewson
5acf18bfaa
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-05-07 10:41:34 -04:00
Nick Mathewson
7c86f34340
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-05-07 10:41:34 -04:00
Nick Mathewson
48dd87933d
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-05-07 10:41:33 -04:00
Nick Mathewson
e2c1ac214c
Reindent a few lines to fix a GCC warning.
...
As of GCC 11.1.1, the compiler warns us about code like this:
if (a)
b;
c;
and that's a good thing: we wouldn't want to "goto fail". But we
had an instance if this in circuituse.c, which was making our
compilation sad.
Fixes bug 40380; bugfix on 0.3.0.1-alpha.
2021-05-07 10:39:20 -04:00
Nick Mathewson
0397a9cb49
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-05-07 09:53:58 -04:00
Nick Mathewson
7fe819c951
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-05-07 09:53:58 -04:00
Nick Mathewson
f68aeda549
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-05-07 09:53:57 -04:00
Nick Mathewson
621f8a304a
Update geoip files to match ipfire location db, 2021/05/07.
2021-05-07 09:53:46 -04:00
Nick Mathewson
8142b368e7
Bump to 0.4.6.3-rc
2021-05-07 09:42:18 -04:00
Nick Mathewson
3483d6aab5
Merge branch 'maint-0.4.5' into maint-0.4.6
...
"ours" to avoid version bump.
2021-05-07 09:39:45 -04:00
Nick Mathewson
ec0b4bdafd
Bump to 0.4.5.8.
2021-05-07 09:39:33 -04:00
David Goulet
a42e58a284
Merge branch 'tor-gitlab/mr/375' into maint-0.4.6
2021-05-07 09:05:16 -04:00
David Goulet
b1b4c05fb3
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-05-07 09:03:39 -04:00
George Kadianakis
80c404c4b7
Log warning when connecting to soon-to-be-deprecated v2 onions.
2021-05-07 08:44:36 -04:00
George Kadianakis
5e836eb80c
Add warning when trying to connect to deprecated v2 onions.
2021-05-07 08:41:46 -04:00
George Kadianakis
f230beadf4
Prepare for #40373 : Re-introduce parsing for v2 onion addresses.
...
Welcome back ONION_V2_HOSTNAME! :)
2021-05-05 11:05:45 +03:00
David Goulet
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
George Kadianakis
f0260c4cea
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-04-23 13:00:23 +03:00
David Goulet
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
Nick Mathewson
38bfb3cdfe
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-04-21 10:34:28 -04:00
Nick Mathewson
a4a3721690
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-04-21 10:34:28 -04:00
Nick Mathewson
87d96f7162
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-21 10:34:14 -04:00
George Kadianakis
32eea3b006
Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5
2021-04-21 16:48:22 +03:00
Nick Mathewson
0ceacb5482
Merge branch 'mr_347_squashed' into maint-0.4.6
2021-04-19 11:40:44 -04:00
David Goulet
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
Nick Mathewson
d162b98548
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-04-19 11:30:00 -04:00
Nick Mathewson
cd75eac743
Tweak changes/ticket40369 to be a bug.
2021-04-19 11:29:46 -04:00
Emery Hemingway
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
George Kadianakis
461a3c732b
Merge branch 'maint-0.4.5' into maint-0.4.6
2021-04-19 17:33:46 +03:00
George Kadianakis
925ec0e0ea
Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5
2021-04-19 17:32:56 +03:00
Nick Mathewson
e6d9dd9157
Bump to 0.4.6.2-alpha-dev
2021-04-15 12:42:23 -04:00
Nick Mathewson
284f445248
two more changelog fixes from arma
2021-04-14 15:22:26 -04:00
Nick Mathewson
c5f84ce6a3
changelog edits from arma
2021-04-14 15:15:15 -04:00
Nick Mathewson
943d4834af
light changelog edits
2021-04-14 14:24:32 -04:00
Nick Mathewson
33ca927a8e
Start a changes file for 0.4.6.2-alpha
2021-04-14 10:58:15 -04:00
Nick Mathewson
96d4466488
Bump version to 0.4.6.2-alpha.
2021-04-14 10:55:48 -04:00
Nick Mathewson
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
David Goulet
91569c4dad
Merge branch 'maint-0.4.5'
2021-04-14 08:39:17 -04:00
David Goulet
bba3393d20
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-14 08:39:16 -04:00
David Goulet
30fa80c0fc
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-04-14 08:39:16 -04:00
David Goulet
131e2d99a4
fallbackdir: Remove two unspec lines
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-04-14 08:39:04 -04:00
Nick Mathewson
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
Nick Mathewson
2815721243
Merge branch 'maint-0.4.5'
2021-04-13 17:00:56 -04:00
Nick Mathewson
59bc377dce
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-04-13 16:59:16 -04:00
Nick Mathewson
59f6248e09
Merge branch 'maint-0.3.5' into maint-0.4.4
2021-04-13 16:59:15 -04:00
David Goulet
ee7c50b8a7
fallbackdir: Renegerate list with 200 relays
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-04-13 15:15:58 -04:00
Alexander Færøy
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