[tor-commits] [tor/release-0.2.2] Merge branch 'bug3306_nm_squashed' into maint-0.2.2

[arma at torproject.org]

commit 9e3fc5f61685f937d76e60c5fa1781b80aa5bf68
Merge: 83e3975 42e4e15
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 6 16:18:24 2011 -0400

    Merge branch 'bug3306_nm_squashed' into maint-0.2.2

 changes/bug3306       |    9 +++++++++
 src/common/crypto.c   |    5 +++--
 src/or/circuitbuild.c |   10 +++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)