[tor-commits] [tor/master] Merge branch 'cov_run224_squashed'

[nickm at torproject.org]

commit 6df3869f3b3448d041ece19498d062104c32fa45
Merge: e0a053b ce6a2c2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 26 13:22:51 2011 -0400

    Merge branch 'cov_run224_squashed'

 changes/cov_485,486,487 |    5 +++++
 src/or/config.c         |    7 +++++--
 src/or/connection.c     |    4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)