Neel Chauhan
d103466282
Add missing newline between get_all_possible_sybil() and version_from_platform()
2021-02-03 14:07:01 -08:00
Nick Mathewson
d06dfc0845
Merge branch 'maint-0.4.5'
2021-02-03 13:39:55 -05:00
Nick Mathewson
ff1b24fb73
Merge branch 'maint-0.4.4' into maint-0.4.5
...
"ours" to avoid version bump.
2021-02-03 13:39:41 -05:00
Nick Mathewson
2933c37188
Merge branch 'maint-0.4.3' into maint-0.4.4
...
"ours" to avoid version bump.
2021-02-03 13:39:28 -05:00
Nick Mathewson
8a17999da3
Merge branch 'maint-0.3.5' into maint-0.4.3
...
"ours" to avoid version bump.
2021-02-03 13:39:08 -05:00
Nick Mathewson
f3ba71bbee
bump to 0.4.4.7-dev
2021-02-03 13:39:03 -05:00
Nick Mathewson
0d14ac1e0e
bump to 0.4.3.8-dev
2021-02-03 13:38:56 -05:00
Nick Mathewson
21317c9229
Bump to 0.3.5.13-dev.
2021-02-03 13:37:28 -05:00
Neel Chauhan
22f55fdb2a
Document REND_V3_AUTH flag
2021-02-03 10:25:46 -08:00
Nick Mathewson
14c89e4863
copy stable release entries forward into changelog and releasenotes
2021-02-03 12:58:40 -05:00
David Goulet
22941c5299
Merge branch 'maint-0.4.5'
2021-02-03 09:35:50 -05:00
David Goulet
44b4aa82aa
nodelist: Remove merge artefact
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-03 09:35:45 -05:00
David Goulet
970d49f11b
Merge branch 'maint-0.4.5'
2021-02-03 09:11:15 -05:00
David Goulet
9e91bb31cc
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-02-03 09:11:15 -05:00
David Goulet
61e38deb56
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-02-03 09:11:14 -05:00
David Goulet
890a9e89ba
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-02-03 09:11:14 -05:00
David Goulet
f322ea3fa8
Merge branch 'ticket40269_035_01' into maint-0.3.5
2021-02-03 09:11:09 -05:00
David Goulet
6f95cdf87e
Remove unused addr_port_set code
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-03 09:11:01 -05:00
David Goulet
1b298e1863
Merge branch 'maint-0.4.5'
2021-02-03 08:58:17 -05:00
David Goulet
a0b3e9116d
Merge branch 'maint-0.4.4' into maint-0.4.5
2021-02-03 08:58:02 -05:00
David Goulet
eda81ea27e
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-02-03 08:56:38 -05:00
David Goulet
cc5d5a5d1e
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-02-03 08:56:38 -05:00
David Goulet
a3cef41fc3
Merge branch 'ticket40270_035_01' into maint-0.3.5
2021-02-03 08:56:30 -05:00
David Goulet
903bfc4eca
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-02-03 08:54:40 -05:00
David Goulet
e50648582b
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-02-03 08:54:40 -05:00
David Goulet
c2cee6c780
node: Move reentry set to use a digestmap_t
...
Any lookup now will be certain and not probabilistic as the bloomfilter.
Closes #40269
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-03 08:54:02 -05:00
David Goulet
59f1a41a7f
relay: Send back CONNECTION_REFUSED on reentry
...
The TORPROTOCOL reason causes the client to close the circuit which is not
what we want because other valid streams might be on it.
Instead, CONNECTION_REFUSED will leave it open but will not allow more streams
to be attached to it. The client then open a new circuit to the destination.
Closes #40270
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-03 08:52:48 -05:00
David Goulet
36b51a1c71
Merge branch 'maint-0.4.3' into maint-0.4.4
2021-02-03 08:51:37 -05:00
David Goulet
0f8195406e
Merge branch 'maint-0.3.5' into maint-0.4.3
2021-02-03 08:51:36 -05:00
David Goulet
98590621bb
relay: Double the size of the relay reentry set
...
This is to minimize false positive and thus deny reentry to Exit connections
that were in reality not re-entering. Helps with overall UX.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-03 08:51:00 -05:00
David Goulet
ce3af5dd59
relay: Follow consensus parameter for network reentry
...
Obey the "allow-network-reentry" consensus parameters in order to decide to
allow it or not at the Exit.
Closes #40268
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-03 08:50:56 -05:00
George Kadianakis
0ba0d738a8
Merge remote-tracking branch 'tor-gitlab/mr/279'
2021-02-02 15:25:22 +02:00
Helge Deller
8ea00c85cb
Fix testcases regarding O_NONBLOCK on parisc/hppa architecture
...
On the parisc/hppa architecture, the O_NONBLOCK constant can be either
000200000 or 000200004, depending on the Linux kernel and glibc version
on which the binary is running.
Background of this can be read in this upstream Linux kernel patch:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=75ae04206a4d0e4f541c1d692b7febd1c0fdb814
The tor testcases fail because of this, because function
fd_is_nonblocking() checks hard against the O_NONBLOCK value, while it's
sufficient if it would only check if one of the bits is set.
Fix this trivial issue by just comparing if the returned file descriptor flag
and'ed with O_NONBLOCK is non-zero.
As reference, a failing build on parisc/hppa can be seen here:
https://buildd.debian.org/status/fetch.php?pkg=tor&arch=hppa&ver=0.4.4.6-1%2Bb1&stamp=1612225628&raw=0
2021-02-02 12:20:13 +01:00
Nick Mathewson
a81581e6be
Merge branch 'maint-0.4.5'
...
"ours" to avoid version bump.
2021-02-01 16:15:16 -05:00
Nick Mathewson
732bbff29c
forward-port changelog from 0.4.5.5-rc
2021-02-01 16:15:03 -05:00
Nick Mathewson
40eeb63b5e
bump to 0.4.5.5-rc-dev
2021-02-01 16:14:07 -05:00
David Goulet
6bde42b4de
Merge branch 'maint-0.4.5'
2021-02-01 14:10:06 -05:00
David Goulet
ed373eaa8d
Merge branch 'tor-gitlab/mr/289' into maint-0.4.5
2021-02-01 14:09:58 -05:00
David Goulet
387d1d8835
relay: Send back CONNECTION_REFUSED on reentry
...
The TORPROTOCOL reason causes the client to close the circuit which is not
what we want because other valid streams might be on it.
Instead, CONNECTION_REFUSED will leave it open but will not allow more streams
to be attached to it. The client then open a new circuit to the destination.
Closes #40270
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-01 12:45:32 -05:00
David Goulet
627e7d6625
Remove unused addr_port_set code
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-01 12:28:29 -05:00
David Goulet
bd4a3f64a1
node: Move reentry set to use a digestmap_t
...
Any lookup now will be certain and not probabilistic as the bloomfilter.
Closes #40269
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-01 12:22:23 -05:00
David Goulet
385fda038f
Merge branch 'maint-0.4.5'
2021-02-01 09:24:38 -05:00
David Goulet
838e07be9d
relay: Double the size of the relay reentry set
...
This is to minimize false positive and thus deny reentry to Exit connections
that were in reality not re-entering. Helps with overall UX.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-01 09:04:50 -05:00
David Goulet
2c3c30e58f
relay: Follow consensus parameter for network reentry
...
Obey the "allow-network-reentry" consensus parameters in order to decide to
allow it or not at the Exit.
Closes #40268
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-02-01 08:56:27 -05:00
Nick Mathewson
1eec42dee4
Remove changes files merged in 0455-rc
2021-01-29 17:11:13 -05:00
David Goulet
b2434d30d2
Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01
2021-01-29 14:54:21 -05:00
David Goulet
705fd37875
Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01
2021-01-29 14:51:38 -05:00
David Goulet
ec9575944a
Merge branch 'maint-0.4.5'
2021-01-29 14:40:56 -05:00
George Kadianakis
46efbcb116
test: Add test for exits blocking reentry to the network
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2021-01-29 14:28:56 -05:00
Roger Dingledine
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