Nick Mathewson 83f66db79e Merge branch 'disable_network' %!s(int64=14) %!d(string=hai) anos
..
bug4584 efba71b03c Add a changes file. %!s(int64=14) %!d(string=hai) anos
config 230422b955 Support for a defaults torrc file. %!s(int64=14) %!d(string=hai) anos
disable_network df9b76460c New 'DisableNetwork' option to prevent Tor from using the network %!s(int64=14) %!d(string=hai) anos
proposal178 e5e4bfd167 Implement consensus method 12 (proposal 178) %!s(int64=14) %!d(string=hai) anos