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

[nickm at torproject.org]

commit 7ee67c47fae2263e8c4f5599e0fbba6531738120
Merge: 15b8c860d 2d61a8351
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:22:32 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

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