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

[arma at torproject.org]

commit c2cc180c46c3e3dc593890fef5adaa9fdca7b430
Merge: d632c58 4a1a89b
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Oct 26 16:31:58 2011 -0400

    Merge branch 'maint-0.2.2' into release-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(-)