Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/circuitbuild.c

diff --cc src/or/circuitbuild.c
index 7c404e63cb565e07d825ca27fc72aac95e6352f2,decb18fc11b359a54fafc70519d24f182ebb9bf1..3948008775acd06988474194b720b4ba5772ebc4
--- 1/src/or/circuitbuild.c
--- 2/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 */
      }