[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit d47da400584900193d61d8feaf874a0ff2abec13
Merge: 5fd8f3b71 2d61a8351
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:22:32 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26069       | 5 +++++
 src/or/hs_descriptor.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)