commit 4c6fd7106fdf1a31c1e50a992c03dac69cd25a47 Merge: 81e3dee 280672b Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 8 10:41:51 2015 -0400 Merge branch 'bug16980' changes/bug16980 | 6 ++++++ src/common/crypto.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-)