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

[arma at torproject.org]

commit 4f83d6d6ad336268d5befd757301c894e5072e1e
Merge: 143da7316 5f2c7a856
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Jan 5 18:44:08 2018 -0500

    Merge branch 'maint-0.3.2'

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