Nick Mathewson e74c360156 Merge remote-tracking branch 'public/bug12195'

2014-06-04 12:16:03 -04:00

..

bug10405

fix #10405's changes file

2014-06-02 02:32:59 -04:00

bug12170

Avoid needless router_dir_info_has_changed from router_set_status

2014-06-02 00:45:15 -04:00

bug12195

Fix ancient code that only checked circ_id, not circ_id and chan

2014-06-03 18:19:08 -04:00