Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05

1 files changed, 8 insertions, 0 deletions

diff --git a/src/or/dos.c b/src/or/dos.c
index e7f3241ef4..4d1797eece 100644
--- a/src/or/dos.c
+++ b/src/or/dos.c
@@ -748,6 +748,14 @@ dos_close_client_conn(const or_connection_t *or_conn)
 void
 dos_consensus_has_changed(const networkstatus_t *ns)
 {
+  /* There are two ways to configure this subsystem, one at startup through
+   * dos_init() which is called when the options are parsed. And this one
+   * through the consensus. We don't want to enable any DoS mitigation if we
+   * aren't a public relay. */
+  if (!public_server_mode(get_options())) {
+    return;
+  }
+
   cc_consensus_has_changed(ns);
   conn_consensus_has_changed(ns);