Merge branch 'maint-0.3.1'

diff --cc src/or/hs_descriptor.c
Simple merge

diff --cc src/test/test_hs_descriptor.c
index 77bdd4be5e35bec9ca0d78f96fa98b2ebf0273d9,8f8da361de591297cd722d6ab10d8be580bf6047..ab6a43ec7020a5e76c267901766079bb63d78a95
--- 1/src/test/test_hs_descriptor.c
--- 2/src/test/test_hs_descriptor.c
+++ b/src/test/test_hs_descriptor.c
@@@ -551,9 -553,30 +559,30 @@@ test_decode_invalid_intro_point(void *a
  
   done:
    hs_descriptor_free(desc);
 -  desc_intro_point_free(ip);
 +  hs_desc_intro_point_free(ip);
  }
  
+ /** Make sure we fail gracefully when decoding the bad desc from #23233. */
+ static void
+ test_decode_bad_signature(void *arg)
+ {
+   hs_desc_plaintext_data_t desc_plaintext;
+   int ret;
+ 
+   (void) arg;
+ 
+   /* Update approx time to dodge cert expiration */
+   update_approx_time(1502661599);
+ 
+   setup_full_capture_of_logs(LOG_WARN);
+   ret = hs_desc_decode_plaintext(HS_DESC_BAD_SIG, &desc_plaintext);
+   tt_int_op(ret, OP_EQ, -1);
+   expect_log_msg_containing("Malformed signature line. Rejecting.");
+   teardown_capture_of_logs();
+ 
+  done: ;
+ }
+ 
  static void
  test_decode_plaintext(void *arg)
  {