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

[nickm at torproject.org]

commit 08d933a7942434613418430cbe3c81d9fb4febb7
Merge: a71552268 d0b75b5ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 12:27:44 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24262   | 3 +++
 src/or/hs_common.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)