Commit 526beb7b authored by Roger Dingledine's avatar Roger Dingledine
Browse files

be willing to use nodes in excludeexitnodes as directory mirrors 

fixes bug 5623.
parent bdd7e287

changes/bug5623

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  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
Original line number Diff line number Diff line
@@ -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;