[tor-commits] [tor/release-0.3.1] Merge branch 'trove-2017-011_025' into maint-0.2.5

[nickm at torproject.org]

commit 08ce39fb0fd50ab0da4201201fa07e7776cb09e7
Merge: a6a0c7a4e 1880a6a88
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 12:06:17 2017 -0500

    Merge branch 'trove-2017-011_025' into maint-0.2.5

 changes/trove-2017-011 |  8 ++++++++
 src/common/crypto.c    | 16 +++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)