Merge branch 'maint-0.3.1' into maint-0.3.2

changes/bug24262

@@ -0,0 +1,3 @@
+  o Minor bugfixes (hidden service):
+    - Fix the consensus parameter "hsdir-interval" to "hsdir_interval" so it
+      matches the dir-spec.txt. Fixes bug 24262; bugfix on 0.3.1.1-alpha.

src/or/hs_common.c

@@ -224,7 +224,7 @@ get_time_period_length(void)
     return sr_state_get_protocol_run_duration() / 60;
   }
 
-  int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval",
+  int32_t time_period_length = networkstatus_get_param(NULL, "hsdir_interval",
                                              HS_TIME_PERIOD_LENGTH_DEFAULT,
                                              HS_TIME_PERIOD_LENGTH_MIN,
                                              HS_TIME_PERIOD_LENGTH_MAX);