[tor-commits] [tor/master] Merge branch 'bug23080'

[nickm at torproject.org]

commit 2998350122884f57c3fe5248fc819b829434f2dd
Merge: ff0aabc35 c4e8548c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 20 12:12:02 2017 -0400

    Merge branch 'bug23080'

 changes/bug23080    | 5 +++++
 src/or/ext_orport.c | 5 +++++
 2 files changed, 10 insertions(+)