Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/control.c
Simple merge

diff --cc src/or/dirserv.c
Simple merge

diff --cc src/or/router.c
index 3f94703a26dfe75a037a71f326bdff3bfc42ba68,57c0618bfb06e54a9fb4525481aaef063729ad2d..d70756fdbf8718f0ee1b45b2aa6b97d8187f6c5c
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c
@@@ -1570,15 -1625,9 +1627,15 @@@ decide_if_publishable_server(void
      return 1;
    if (!router_get_advertised_or_port(options))
      return 0;
-   if (!check_whether_orport_reachable())
 -
 -  return check_whether_orport_reachable(options) &&
 -         check_whether_dirport_reachable(options);
++  if (!check_whether_orport_reachable(options))
 +    return 0;
 +  if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) {
 +    /* All set: there are no exits in the consensus (maybe this is a tiny
 +     * test network), so we can't check our DirPort reachability. */
 +    return 1;
 +  } else {
-     return check_whether_dirport_reachable();
++    return check_whether_dirport_reachable(options);
 +  }
  }
  
  /** Initiate server descriptor upload as reasonable (if server is publishable,