commit 7fbf1e225e81171e72fdd31a538b55da16b97ab7 Merge: 8d74fba d05bc02 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 10 16:44:03 2012 -0500

Merge remote-tracking branch 'asn-mytor/bug4746'

src/common/crypto.c | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-)