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

[arma at torproject.org]

commit 0d172c1182bacb3c6d7e4538df87e706b720be30
Merge: 8edc0be74 5f2c7a856
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Jan 5 18:26:14 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

 src/common/crypto.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)