torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
31,578 Commits 53 Branches 631 Tags
72a0cdb1cdda3e596cbf24a543e10de43c9211a5
Commit Graph
31578 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 72a0cdb1cd Merge branch 'maint-0.3.5' into release-0.3.5 2021-03-15 08:52:28 -04:00
Nick Mathewson f46f4562cf Merge branch 'bug40286_disable_min_035' into maint-0.3.5 2021-03-15 08:41:03 -04:00
Nick Mathewson 9dc1838693 Merge branch 'maint-0.3.5' into release-0.3.5 2021-03-15 07:42:55 -04:00
Nick Mathewson 1a0b5fd569 Bump to 0.3.5.14 2021-03-15 07:39:45 -04:00
Nick Mathewson c9b4d4aa75 Merge branch 'maint-0.3.5' into release-0.3.5 2021-03-12 11:36:34 -05:00
Nick Mathewson 02230575c4 Remove maxmind license; add ipfire location database license (cc by-sa 4.0) 2021-03-12 11:36:28 -05:00
Nick Mathewson c1ce126c74 Use the right ticket number. 2021-03-12 11:31:36 -05:00
Nick Mathewson 9bcd9523be Merge branch 'maint-0.3.5' into release-0.3.5 2021-03-12 11:30:21 -05:00
Nick Mathewson aa6c7741e8 update geoip-2021-03-12 to mention provider transition. 2021-03-12 11:29:09 -05:00
Nick Mathewson a7b3cb06f5 Update geoip files to match ipfire location db, 2021/03/12. 2021-03-12 11:26:07 -05:00
David Goulet 2bc49d3828 Merge branch 'maint-0.3.5' into release-0.3.5 2021-03-01 08:24:28 -05:00
David Goulet 296a557bfc Remove mallinfo() from codebase 
Now deprecated in libc >= 2.33

Closes #40309

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-02-23 11:02:33 -05:00
Nick Mathewson ede88c374c Disable the dump_desc() function. 
It can be called with strings that should have been
length-delimited, but which in fact are not.  This can cause a
CPU-DoS bug or, in a worse case, a crash.

Since this function isn't essential, the best solution for older
Tors is to just turn it off.

Fixes bug 40286; bugfix on 0.2.2.1-alpha when dump_desc() was
introduced.
 2021-02-19 12:31:19 -05:00
Nick Mathewson fdd4bc3f43 Merge branch 'maint-0.3.5' into release-0.3.5 2021-02-03 13:39:54 -05:00
Nick Mathewson 21317c9229 Bump to 0.3.5.13-dev. 2021-02-03 13:37:28 -05:00
Nick Mathewson cd60c6ec6b copy changelog into releasenotes 2021-02-03 12:58:07 -05:00
Nick Mathewson fc4d507748 Fold in the entry for 2667 tor-0.3.5.13 2021-02-03 09:53:41 -05:00
David Goulet b9689553d6 Merge branch 'maint-0.3.5' into release-0.3.5 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 c3741d754e Merge branch 'maint-0.3.5' into release-0.3.5 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 4dfada509a Merge branch 'maint-0.3.5' into release-0.3.5 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 bf80465d86 Merge branch 'maint-0.3.5' into release-0.3.5 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 a5b4ee2a01 Merge branch 'maint-0.3.5' into release-0.3.5 2021-02-03 08:44:19 -05:00
Nick Mathewson 16bd8c7247 0.3.5.13 changelog blurb. 2021-02-02 17:23:29 -05:00
Nick Mathewson 4d9c7b8d81 start a changelog for 0.3.5.13. 2021-02-02 16:04:15 -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 3ec07671c1 Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-28 12:46:30 -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 f25c604e97 Merge branch 'maint-0.3.5' into release-0.3.5 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 c25d549647 Merge branch 'maint-0.3.5' into release-0.3.5 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 5db8bffa43 Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-28 12:14:10 -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 de6644bcba Merge branch 'maint-0.3.5' into release-0.3.5 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 b5fd3f127f Merge branch 'maint-0.3.5' into release-0.3.5 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 1f39a13d14 Merge branch 'maint-0.3.5' into release-0.3.5 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
David Goulet 869fa2a2ef Merge branch 'maint-0.3.5' into release-0.3.5 2021-01-28 12:00:17 -05:00
David Goulet 2cf1365c17 Merge branch 'tor-gitlab/mr/186' into maint-0.3.5 2021-01-28 12:00:10 -05:00