Nick Mathewson 83f66db79e Merge branch 'disable_network'		2011-11-29 17:52:23 -05:00
..
bug4584	Add a changes file.	2011-11-27 09:03:37 +01:00
config	Support for a defaults torrc file.	2011-11-27 22:25:52 -05:00
disable_network	New 'DisableNetwork' option to prevent Tor from using the network	2011-11-28 15:44:10 -05:00
proposal178	Implement consensus method 12 (proposal 178)	2011-11-27 09:29:33 -05:00