[tor-commits] [tor/master] Merge remote-tracking branch 'teor/comments-20151204'

commit f727ebcba8f77e2863d78f1d7c0dd34eae3be699 Merge: 0ec6757 329aa59 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 7 10:13:20 2015 -0500 Merge remote-tracking branch 'teor/comments-20151204' src/or/connection.c | 8 ++++++-- src/or/main.c | 3 +-- src/or/router.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)