[tor-commits] [tor/master] Merge remote-tracking branch 'onionk/connection-comments1'

[nickm at torproject.org]

commit b26db5dddb659f76ed3eb51f786ea76f7a5d009d
Merge: 48632455a 0cd72a283
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 28 16:07:46 2018 -0400

    Merge remote-tracking branch 'onionk/connection-comments1'

 src/core/mainloop/connection.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)