Merge branch 'maint-0.3.1' into maint-0.3.2

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

diff --cc src/or/hs_descriptor.c
index fef0607c1d77a7cdf39c6f2d2dcfca349e0e6c1f,8e10c0fff85633144f6c739a49f5722d49b7e39d..582ac9cb7cb38e5f203e38b5c8ffdc2885c78422
--- 1/src/or/hs_descriptor.c
--- 2/src/or/hs_descriptor.c
+++ b/src/or/hs_descriptor.c
@@@ -1115,16 -1133,8 +1115,17 @@@ decode_link_specifiers(const char *enco
        memcpy(hs_spec->u.legacy_id, link_specifier_getarray_un_legacy_id(ls),
               sizeof(hs_spec->u.legacy_id));
        break;
 +    case LS_ED25519_ID:
 +      /* Both are known at compile time so let's make sure they are the same
 +       * else we can copy memory out of bound. */
 +      tor_assert(link_specifier_getlen_un_ed25519_id(ls) ==
 +                 sizeof(hs_spec->u.ed25519_id));
 +      memcpy(hs_spec->u.ed25519_id,
 +             link_specifier_getconstarray_un_ed25519_id(ls),
 +             sizeof(hs_spec->u.ed25519_id));
 +      break;
      default:
+       tor_free(hs_spec);
        goto err;
      }
  

diff --cc src/test/hs_test_helpers.c
Simple merge

diff --cc src/test/test_channelpadding.c
Simple merge

diff --cc src/test/test_hs_descriptor.c
Simple merge