From: George Kadianakis <desnacked@riseup.net>
Date: Wed, 1 Mar 2017 13:56:29 +0000 (+0200)
Subject: Prevent SRV assert when called from misconfigured bridge auth.
X-Git-Tag: tor-0.3.1.1-alpha~245^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=931948ac6ad0c6f5327fd3c212ce6fe241a071f1;p=thirdparty%2Ftor.git

Prevent SRV assert when called from misconfigured bridge auth.
---

diff --git a/changes/bug21586 b/changes/bug21586
new file mode 100644
index 0000000000..200d55a8e8
--- /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 5549f97998..475587eacd 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;
     }