commit 7aa20b20bffcbc4c9b4e3eb1c874616e1cab119f Merge: de069f5 bbf2fee Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 3 11:34:32 2011 -0400

Merge branch 'bug3318c' into maint-0.2.2

changes/bug3318 | 6 +++++- src/common/crypto.c | 11 +++++++++++ src/common/crypto.h | 1 + src/or/routerparse.c | 4 ++-- src/test/test_crypto.c | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-)