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

[nickm at torproject.org]

commit c35416ab8fbb360fded3db875eb252ba1a9b3273
Merge: 8dc3b5ff3 df312b3cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 12:51:45 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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