commit 83f66db79ec6469beea0fb410be6536acb90ffd0 Merge: 9e25422 9e8f3ee Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 29 17:52:23 2011 -0500

Merge branch 'disable_network'

changes/disable_network | 9 ++++++ doc/tor.1.txt | 6 ++++ src/or/config.c | 13 ++++++++- src/or/connection.c | 68 +++++++++++++++++++++++++++++++++++++++++++--- src/or/connection.h | 3 ++ src/or/dns.c | 7 +++++ src/or/hibernate.c | 11 +------- src/or/main.c | 29 +++++++++++--------- src/or/or.h | 4 +++ src/or/router.c | 12 +++++++- src/or/router.h | 2 + src/or/routerlist.c | 6 +++- 12 files changed, 138 insertions(+), 32 deletions(-)