Merge remote-tracking branch 'public/bug9366' into maint-0.2.4

1 files changed, 7 insertions, 0 deletions

diff --git a/src/or/config.c b/src/or/config.c
index 793fd557a3..4e08f3c3a5 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5519,6 +5519,13 @@ check_server_ports(const smartlist_t *ports,
              "listening on one.");
     r = -1;
   }
+  if (n_orport_listeners && !n_orport_advertised) {
+    log_warn(LD_CONFIG, "We are listening on an ORPort, but not advertising "
+             "any ORPorts. This will keep us from building a %s "
+             "descriptor, and make us impossible to use.",
+             options->BridgeRelay ? "bridge" : "router");
+    r = -1;
+  }
   if (n_dirport_advertised && !n_dirport_listeners) {
     log_warn(LD_CONFIG, "We are advertising a DirPort, but not actually "
              "listening on one.");