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

[nickm at torproject.org]

commit 83ced3e7fe6c7573e17b61ecb1be873fa972b635
Merge: 28fbfa871 fc33caada
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 09:59:51 2017 -0500

    Merge branch 'maint-0.3.2'

 changes/ticket24425 | 4 ++++
 src/or/hs_common.h  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)