commit 60b41cd435c0acef274209a2a9b494b5f42964f6 Merge: 29db095 02708b7 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 30 13:18:56 2011 -0500

Merge branch 'bug4538_v2'

src/common/crypto.c | 70 ++++++++++++++++++++++++++++---------------------- 1 files changed, 39 insertions(+), 31 deletions(-)