9fbedc74c3
Merge branch 'maint-0.4.5'
2021-02-12 13:50:36 +02:00
58b5300f44
Merge remote-tracking branch 'tor-gitlab/mr/295' into maint-0.4.5
2021-02-12 13:44:03 +02:00
14e1c2fe0a
Merge branch 'maint-0.4.5'
2021-02-08 14:31:13 -05:00
758000aa98
Merge remote-tracking branch 'tor-gitlab/mr/296' into maint-0.4.5
2021-02-08 14:30:11 -05:00
d6b82d79dc
Merge branch 'maint-0.4.5'
2021-02-08 14:28:19 -05:00
01c4abc2d4
conn: Properly close MetricsPort socket on EOF
...
Handle the EOF situation for a metrics connection. Furthermore, if we failed
to fetch the data from the inbuf properly, mark the socket as closed because
the caller, connection_process_inbuf(), assumes that we did so on error.
Fixes #40257
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-08 14:26:45 -05:00
0efc1e6372
40274: Add a changes file and make the same change with FD_CLOEXEC
2021-02-08 12:39:12 -05:00
56f1cab9c1
Don't log supported-protover warnings if consensus is older than Tor.
...
Previously we would warn in this case... but there's really no
justification for doing so, and it can only cause confusion.
Fixes bug #40281 ; bugfix on 0.4.0.1-alpha.
2021-02-08 11:52:53 -05:00
685c4866ac
relay: Look at the omit IPv6 flag when publishing
...
In two instances we must look at this flag:
1. When we build the descriptor so the IPv6 is NOT added to the descriptor in
case we judge that we need to omit the address but still publish.
2. When we are deciding if the descriptor is publishable. This flags tells us
that the IPv6 was not found reachable but we should still publish.
Fixes #40279
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-02-08 11:51:45 -05:00
576e248bc2
Merge remote-tracking branch 'tor-gitlab/mr/278'
2021-02-08 10:44:58 -05:00
90add50550
Merge branch 'bug40249_squashed'
2021-02-08 10:31:30 -05:00
d159bdb0f4
Add a colon to ticket40249 changes entry
2021-02-08 10:31:18 -05:00
2391c60c5c
Add stream ID to ADDRMAP control event
2021-02-08 10:23:41 -05:00
d4255253b0
Merge remote-tracking branch 'tor-gitlab/mr/212'
2021-02-08 13:03:07 +02:00
49c61c1bb8
Delete changes/40241_v2 as it breaks CI.
...
Unreviewed build fix. Discussed the cnage on IRC with Nick.
2021-02-05 19:18:13 +00:00
0ba0d738a8
Merge remote-tracking branch 'tor-gitlab/mr/279'
2021-02-02 15:25:22 +02:00
1eec42dee4
Remove changes files merged in 0455-rc
2021-01-29 17:11:13 -05:00
b2434d30d2
Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01
2021-01-29 14:54:21 -05:00
705fd37875
Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01
2021-01-29 14:51:38 -05:00
ec9575944a
Merge branch 'maint-0.4.5'
2021-01-29 14:40:56 -05:00
632688c797
exit: Deny re-entry into the network
...
Exit relays now reject exit attempts to known relay addresses + ORPort and
also to authorities on the ORPort and DirPort.
Closes #2667
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-29 14:28:54 -05:00
93ac6ec4d3
exit: Deny re-entry into the network
...
Exit relays now reject exit attempts to known relay addresses + ORPort and
also to authorities on the ORPort and DirPort.
Closes #2667
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-29 14:19:17 -05:00
ea38016202
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:46:31 -05:00
79cb47cfc2
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:46:31 -05:00
9556276f07
Merge branch 'tor-gitlab/mr/50' into maint-0.3.5
2021-01-28 12:46:24 -05:00
be81ecba3a
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:42:31 -05:00
f058db1f3d
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:42:31 -05:00
290007e3c4
Merge branch 'tor-gitlab/mr/239' into maint-0.3.5
2021-01-28 12:42:26 -05:00
a3f2bc8f13
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:36:42 -05:00
f3da5f88d7
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:36:42 -05:00
02bd135cb1
Merge branch 'tor-gitlab/mr/243' into maint-0.3.5
2021-01-28 12:36:35 -05:00
1887231afb
Merge branch 'tor-gitlab/mr/256' into maint-0.4.4
2021-01-28 12:12:01 -05:00
5c89197c9f
Merge branch 'tor-gitlab/mr/255' into maint-0.4.3
2021-01-28 12:11:33 -05:00
1bdccc03a9
Merge branch 'tor-gitlab/mr/254' into maint-0.3.5
2021-01-28 12:10:39 -05:00
6186288eb6
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:08:20 -05:00
045db909c2
Merge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5
2021-01-28 12:08:14 -05:00
737cd79c42
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-01-28 12:04:42 -05:00
a17be1b5b6
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-01-28 12:04:42 -05:00
c6fb26695b
Merge remote-tracking branch 'tor-gitlab/mr/186' into maint-0.3.5
2021-01-28 12:04:37 -05:00
a82b4eb305
src/core/mainloop: Put brackets around IPv6 addresses in log messages
2021-01-27 08:23:39 -08:00
a634f6b64c
dos: Move config options within the subsystem
...
Closes #40261
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-27 10:37:36 -05:00
b019c83853
Merge branch 'maint-0.4.5'
2021-01-27 09:36:39 -05:00
2e600019ea
relay: Don't trigger an address discovery without an ORPort
...
We would before do an address discovery and then a lookup in the cache if not
found which is now simplified by calling relay_find_addr_to_publish() directly
which does all those combined.
Furthermore, by doing so, we won't trigger an address discovery every minute
if we have no ORPort configured for the family.
Fixes #40254
Signed-off-by: David Goulet <dgoulet@torproject.org >
2021-01-27 09:36:17 -05:00
dbbd603313
Merge remote-tracking branch 'tor-gitlab/mr/248'
2021-01-27 15:43:01 +02:00
a7ca089343
Merge remote-tracking branch 'tor-gitlab/mr/247'
2021-01-27 15:39:29 +02:00
930a17f347
Remove changes files for entries that have appeared in an 045 changelog.
2021-01-22 15:25:04 -05:00
74cfe3611f
Merge branch 'maint-0.4.5'
2021-01-22 00:21:21 +02:00
4cbd22f1a7
Merge branch 'mr/251' into maint-0.4.5
2021-01-22 00:21:09 +02:00
5d711450dd
Changes file for #40238 .
2021-01-21 23:17:31 +02:00
e06a0e904c
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-01-21 16:07:16 -05:00
George Kadianakis
Nick Mathewson
David Goulet
Neel Chauhan
Alexander Færøy
Roger Dingledine