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

[nickm at torproject.org]

commit 2294e330bde259f6b575f301258783ce2947bdc0
Merge: 1e81aaa62 df312b3cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 12:51:45 2018 -0500

    Merge branch 'maint-0.3.2'

 changes/bug24976  | 5 +++++
 src/or/hs_cache.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)