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

Merge remote-tracking branch 'arma/bug5623'

Browse Source
This commit is contained in:
Nick Mathewson
2012-04-24 15:25:21 -04:00
parent 1cbde0bd50 526beb7be6
commit f86bd1d5a4
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug5623
+6
View File
@@ -0,0 +1,6 @@
o Minor bugfixes:
- After we pick a directory mirror, we would refuse to use it if
it's in our ExcludeExitNodes list, resulting in mysterious failures
to bootstrap for people who just wanted to avoid exiting from
certain locations. Fixes bug 5623; bugfix on 0.2.2.25-alpha.
src/or/connection_edge.c
+6 -2
View File
@@ -3368,8 +3368,12 @@ connection_ap_can_use_exit(const entry_connection_t *conn, const node_t *exit)
}
}
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT &&
!conn->use_begindir) {
if (conn->use_begindir) {
/* Internal directory fetches do not count as exiting. */
return 1;
}
if (conn->socks_request->command == SOCKS_COMMAND_CONNECT) {
struct in_addr in;
tor_addr_t addr, *addrp = NULL;
addr_policy_result_t r;