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

[nickm at torproject.org]

commit a798ba6e9bd5ef7fed89948ffa0e7334ceb1844e
Merge: 5822496d6 779e4b9dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 5 12:10:06 2017 -0500

    Merge branch 'maint-0.3.2'

 changes/ticket24500 |  3 +++
 src/common/crypto.c | 13 +++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)