Nick Mathewson da6c136817 Merge remote-tracking branch 'asn-mytor/bug4548_take2'		2011-11-29 18:30:41 -05:00
..
bug4548	Add a changes file.	2011-11-25 17:44:48 +01: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