torproject/tor
1
0
Fork 0
mirror of https://github.com/torproject/tor.git synced 2025-02-21 11:41:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,427 Commits 51 Branches 614 Tags
Commit Graph

35427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson
1c5dd021a7 Merge branch 'maint-0.4.3' into release-0.4.3 2021-02-03 13:39:54 -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
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
Nick Mathewson
5232091616 copy changelog into releasenotes 2021-02-03 12:58:14 -05:00
Nick Mathewson
5b0fe0ee8a Fold in the entry for 2667 tor-0.4.3.8 2021-02-03 09:53:45 -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
e51724f857 Merge branch 'maint-0.4.3' into release-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
cc5d5a5d1e Merge branch 'maint-0.3.5' into maint-0.4.3 2021-02-03 08:56:38 -05:00
David Goulet
f7f7304c9b Merge branch 'maint-0.4.3' into release-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
e50648582b Merge branch 'maint-0.3.5' into maint-0.4.3 2021-02-03 08:54:40 -05:00
David Goulet
d9e648f0d9 Merge branch 'maint-0.4.3' into release-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
62cecfdc5f Merge branch 'maint-0.4.3' into release-0.4.3 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
David Goulet
0968c40e36 Merge branch 'maint-0.4.3' into release-0.4.3 2021-02-03 08:44:19 -05:00
Nick Mathewson
c51ce99da6 0438 changelog blurb 2021-02-02 17:23:16 -05:00
Nick Mathewson
921f04b114 Start a changelog for 0.4.3.8 2021-02-02 15:59:05 -05:00
David Goulet
705fd37875 Merge branch 'tor-gitlab/mr/284' into ticket2667_043_01 2021-01-29 14:51:38 -05:00
George Kadianakis
9eba65bd8b test: Add test for exits blocking reentry to the network 
Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-01-29 14:19:17 -05:00
Roger Dingledine
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
David Goulet
f26950fa7a relay: Add bloomfiter of relay address + {OR|Dir}Port 
In order to deny re-entry in the network, we now keep a bloomfilter of relay
ORPort + address and authorities ORPort + address and DirPort + address
combinations.

So when an Exit stream is handled, we deny anything connecting back into the
network on the ORPorts for relays and on the ORPort+DirPort for the
authorities.

Related to #2667

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-01-29 14:19:17 -05:00
David Goulet
7ce2f490ad Merge branch 'maint-0.4.3' into release-0.4.3 2021-01-28 12:46:31 -05:00
David Goulet
79cb47cfc2 Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:46:31 -05:00
David Goulet
9556276f07 Merge branch 'tor-gitlab/mr/50' into maint-0.3.5 2021-01-28 12:46:24 -05:00
David Goulet
e44f01f5a8 Merge branch 'maint-0.4.3' into release-0.4.3 2021-01-28 12:42:31 -05:00
David Goulet
f058db1f3d Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:42:31 -05:00
David Goulet
290007e3c4 Merge branch 'tor-gitlab/mr/239' into maint-0.3.5 2021-01-28 12:42:26 -05:00
David Goulet
e5ea02a662 Merge branch 'maint-0.4.3' into release-0.4.3 2021-01-28 12:36:42 -05:00
David Goulet
f3da5f88d7 Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:36:42 -05:00
David Goulet
02bd135cb1 Merge branch 'tor-gitlab/mr/243' into maint-0.3.5 2021-01-28 12:36:35 -05:00
David Goulet
c36c6b5057 Merge branch 'maint-0.4.3' into release-0.4.3 2021-01-28 12:14:10 -05:00
David Goulet
dd5fbc1bd9 Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:14:10 -05:00
David Goulet
5c89197c9f Merge branch 'tor-gitlab/mr/255' into maint-0.4.3 2021-01-28 12:11:33 -05:00
David Goulet
1bdccc03a9 Merge branch 'tor-gitlab/mr/254' into maint-0.3.5 2021-01-28 12:10:39 -05:00
David Goulet
0b49cacd63 Merge branch 'maint-0.4.3' into release-0.4.3 2021-01-28 12:08:21 -05:00
David Goulet
6186288eb6 Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:08:20 -05:00
David Goulet
045db909c2 Merge remote-tracking branch 'tor-gitlab/mr/140' into maint-0.3.5 2021-01-28 12:08:14 -05:00
David Goulet
d2b7f4c1a2 Merge branch 'maint-0.4.3' into release-0.4.3 2021-01-28 12:04:42 -05:00
David Goulet
a17be1b5b6 Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:04:42 -05:00
David Goulet
c6fb26695b Merge remote-tracking branch 'tor-gitlab/mr/186' into maint-0.3.5 2021-01-28 12:04:37 -05:00
David Goulet
ee14fae8a7 Merge branch 'maint-0.4.3' into release-0.4.3 2021-01-28 12:02:43 -05:00
David Goulet
ab58dd1577 Merge branch 'maint-0.3.5' into maint-0.4.3 2021-01-28 12:02:43 -05:00
David Goulet
8f13257ccd Merge branch 'tor-gitlab/mr/140' into maint-0.3.5 2021-01-28 12:02:39 -05:00