[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm@xxxxxxxxxxxxxx]

commit 9f88c1e14f22104992904d99b5c857838acd6cfb
Merge: 978cfcf 99bd540
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Mar 9 14:30:12 2012 -0500

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/circuitbuild.c

 changes/bug5342       |    3 +++
 src/or/circuitbuild.c |    5 +++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --cc src/or/circuitbuild.c
index 7c404e6,decb18f..3948008
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@@ -2719,7 -2704,13 +2719,12 @@@ choose_good_exit_server_general(int nee
        n_supported[i] = -1;
        continue; /* skip routers that are known to be down or bad exits */
      }
 -    if (router->purpose != ROUTER_PURPOSE_GENERAL) {
++    if (node_get_purpose(node) != ROUTER_PURPOSE_GENERAL) {
+       /* never pick a non-general node as a random exit. */
+       n_supported[i] = -1;
+       continue;
+     }
 -    if (options->_ExcludeExitNodesUnion &&
 -        routerset_contains_router(options->_ExcludeExitNodesUnion, router)) {
 +    if (routerset_contains_node(options->_ExcludeExitNodesUnion, node)) {
        n_supported[i] = -1;
        continue; /* user asked us not to use it, no matter what */
      }

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits