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

[nickm at torproject.org]

commit 0c6d05cdd4b20ddacb913e84cc49a4d4082b28d4
Merge: 527eb563c d0b75b5ad
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 12:27:44 2017 -0500

    Merge branch 'maint-0.3.2'

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