[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/cov_run224_022' into maint-0.2.2

[arma at torproject.org]

commit 4a1a89be0cd1abbd2aa4746038f52cd0dcffa65a
Merge: 9af3a3c 246afc1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 26 11:07:28 2011 -0400

    Merge remote-tracking branch 'public/cov_run224_022' into maint-0.2.2

 changes/cov479      |    5 +++++
 changes/cov484      |    4 ++++
 src/common/crypto.c |    4 ++++
 src/or/main.c       |    3 ++-
 4 files changed, 15 insertions(+), 1 deletions(-)