commit 19d6650f8175744a8bd0153201ddc7d222a925af Merge: c8c86c9 eff1cfa Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 18 15:41:14 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-)