commit 548d14247e3c8a48e2efb2ca62ee7a05fca843ba
Merge: 6cc3397 06031b4
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Tue May 17 10:48:12 2016 -0400
Merge remote-tracking branch 'arma/bug18616-v4' into maint-0.2.8
changes/bug18616 | 14 +++++
src/or/circuitbuild.c | 2 +-
src/or/circuituse.c | 5 +-
src/or/config.c | 9 ++--
src/or/control.c | 15 +++---
src/or/dirserv.c | 7 ++-
src/or/main.c | 4 +-
src/or/rephist.c | 9 ++--
src/or/router.c | 140 ++++++++++++++++++++++++++++++++++---------------
src/or/router.h | 4 +-
src/test/test_dir.c | 46 ++++++++++++++++
src/test/test_policy.c | 3 +-
12 files changed, 193 insertions(+), 65 deletions(-)
diff --cc src/or/router.c
index 3f94703,57c0618..d70756f
--- a/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,
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits