[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1

[nickm at torproject.org]

commit b89a66e9975dec4531c5443744f19b8105b4086a
Merge: 419077c26 c997d49ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:06:11 2018 -0400

    Merge remote-tracking branch 'ahf-github/maint-0.3.0' into maint-0.3.1

 src/or/hs_descriptor.c        |  1 +
 src/test/test_hs_descriptor.c | 11 +++++------
 2 files changed, 6 insertions(+), 6 deletions(-)