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

[nickm at torproject.org]

commit c7c043d2b6f42893c220dbb2fd1991f4a34683b6
Merge: 1a070767d 9ef97a268
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 3 10:08:48 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24634          |  3 +++
 src/or/hs_common.c        | 14 +++++++-------
 src/or/hs_service.c       | 12 ++++++------
 src/test/test_hs_common.c |  6 +++---
 4 files changed, 19 insertions(+), 16 deletions(-)