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

[nickm at torproject.org]

commit cf0124b2389431f36f5781a6e7f3181d0590ab0f
Merge: b9c29105f 7eaf055b2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 5 09:26:39 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 src/or/hs_descriptor.c        | 2 +-
 src/or/hs_descriptor.h        | 2 ++
 src/test/test_hs_descriptor.c | 3 ++-
 3 files changed, 5 insertions(+), 2 deletions(-)