mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts: src/or/circuitbuild.c
This commit is contained in:
commit
9f88c1e14f
3
changes/bug5342
Normal file
3
changes/bug5342
Normal file
@ -0,0 +1,3 @@
|
||||
o Security fixes:
|
||||
- Never use a bridge as an exit, even if it claims to be one. Found by
|
||||
wanoskarnet. Fixes bug 5342. Bugfix on ????.
|
@ -2719,6 +2719,11 @@ choose_good_exit_server_general(int need_uptime, int need_capacity)
|
||||
n_supported[i] = -1;
|
||||
continue; /* skip routers that are known to be down or bad exits */
|
||||
}
|
||||
if (node_get_purpose(node) != ROUTER_PURPOSE_GENERAL) {
|
||||
/* never pick a non-general node as a random exit. */
|
||||
n_supported[i] = -1;
|
||||
continue;
|
||||
}
|
||||
if (routerset_contains_node(options->_ExcludeExitNodesUnion, node)) {
|
||||
n_supported[i] = -1;
|
||||
continue; /* user asked us not to use it, no matter what */
|
||||
|
Loading…
Reference in New Issue
Block a user