commit b46d126e647a0789d362036e9a4d957f0d916aff Merge: 16f7851 967491f Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 5 10:38:53 2016 -0400 Merge branch 'maint-0.2.8' src/common/crypto.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)