sengler/tor-parallel-relay-conn @ e74c3601567ab0ca14c5e2a7b9b40b416a47001e

Nick Mathewson e74c360156 Merge remote-tracking branch 'public/bug12195'		10 роки тому
..
bug10405	ea44287657 fix #10405's changes file	10 роки тому
bug12170	ad8977e394 Avoid needless router_dir_info_has_changed from router_set_status	10 роки тому
bug12195	84ed086d48 Fix ancient code that only checked circ_id, not circ_id and chan	10 роки тому