Merge remote branch 'origin/maint-0.2.2'

changes/bug2097-more

@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - Fix a logic error in directory_fetches_from_authorities that
+      would cause all _non_-exits refusing single-hop-like circuits to
+      fetch from authorities, when we wanted to have _exits_ fetch
+      from authorities.  Fix by boboper; fixes more of 2097; bugfix on
+      0.2.2.16-alpha.

src/or/dirserv.c

@@ -1186,7 +1186,7 @@ directory_fetches_from_authorities(or_options_t *options)
     return 0;
   if (server_mode(options) && router_pick_published_address(options, &addr)<0)
     return 1; /* we don't know our IP address; ask an authority. */
-  refuseunknown = router_my_exit_policy_is_reject_star() &&
+  refuseunknown = ! router_my_exit_policy_is_reject_star() &&
     should_refuse_unknown_exits(options);
   if (options->DirPort == 0 && !refuseunknown)
     return 0;