[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit beb9097beda7cc82eec744878a2efd2810351158
Merge: 34f1243 4a1a89b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 26 11:08:19 2011 -0400

    Merge remote-tracking branch 'origin/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(-)