commit eff1cfaaf7bf82aefd16b39922b1297e2f8ce2c9 Merge: ad8a27a fdafe11 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 18 15:40:50 2013 -0400

Merge remote-tracking branch 'public/bug6673' into maint-0.2.4

changes/bug6673 | 4 ++++ src/common/crypto.c | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-)