[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug25512'

[nickm at torproject.org]

commit 4c0e434f33d937f43b49dc707718d73e5aea23b7
Merge: cb083b5d3 3519d0c80
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 28 14:45:47 2018 -0400

    Merge remote-tracking branch 'public/bug25512'

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