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

[nickm at torproject.org]

commit 84d587bed87f26c22f47ca4c3fdd6b6ab4e232db
Merge: e77ece3b3 429d88ad6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 19 08:24:49 2017 -0400

    Merge remote-tracking branch 'teor/minor-comments'

 src/or/connection.c    | 2 +-
 src/or/connection_or.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)