commit 332543baedcf651b75722e5d4626c62fdd24ef60 Merge: 640b402 6cb8c0f Author: Nick Mathewson <nickm@torproject.org> Date: Tue Feb 7 08:34:08 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug18089 | 6 ++++++ src/common/crypto.c | 10 ++++++++++ 2 files changed, 16 insertions(+)