Nick Mathewson 03e4b5a9d7 Merge remote-tracking branch 'linus/bug6757'		2012-10-04 10:31:25 -04:00
..
6757	Have node_get_pref_orport() return an IPv6 OR port when UseBridges is set.	2012-09-19 17:18:06 +02:00
bug7022	properly free the return values of rate_limit_log()	2012-10-03 13:15:27 -04:00
bug7039	pass the reason from the truncated cell to the controller	2012-10-03 23:56:34 -04:00
ticket5749	add faravahar as our ninth v3 dir auth	2012-09-22 09:10:37 -04:00
ticket6997	The --version option should imply --quiet.	2012-10-01 11:01:18 -04:00
warn-about-hses-without-guards	Warn if HSes are configured on a client with UseEntryGuards disabled	2012-09-18 16:50:00 -04:00