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

[nickm at torproject.org]

commit 6b629d30953b02857131f0f41fcb13964c0b33b3
Merge: 677bebda7 ee5c624be
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 09:19:55 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24972       |  4 ++++
 src/or/hs_client.c     |  6 ++++--
 src/or/hs_descriptor.c |  9 ++++++---
 src/or/routerkeys.c    | 11 ++++++++---
 src/or/torcert.c       | 21 ++++++++++++++++++++-
 src/or/torcert.h       |  1 +
 6 files changed, 43 insertions(+), 9 deletions(-)