[tor-commits] [tor/master] Prevent SRV assert when called from misconfigured bridge auth.

[nickm at torproject.org]

commit 931948ac6ad0c6f5327fd3c212ce6fe241a071f1
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Mar 1 15:56:29 2017 +0200

    Prevent SRV assert when called from misconfigured bridge auth.
---
 changes/bug21586 | 4 ++++
 src/or/main.c    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug21586 b/changes/bug21586
new file mode 100644
index 0000000..200d55a
--- /dev/null
+++ b/changes/bug21586
@@ -0,0 +1,4 @@
+  o Minor bugfix (directory authority):
+    - Prevent the shared randomness subsystem from asserting when initialized
+      by a bridge authority with an incomplete configuration file. Fixes bug
+      #21856; bugfix on 0.2.9.8.
diff --git a/src/or/main.c b/src/or/main.c
index 5549f97..475587e 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2405,7 +2405,7 @@ do_main_loop(void)
   }
 
   /* Setup shared random protocol subsystem. */
-  if (authdir_mode_publishes_statuses(get_options())) {
+  if (authdir_mode_v3(get_options())) {
     if (sr_init(1) < 0) {
       return -1;
     }