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

[nickm at torproject.org]

commit eaf7d16826a7d019ffc9990dcd88add48c195328
Merge: 85aba48a6 0aec613a7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 14:51:21 2018 -0400

    Merge branch 'ticket23846'

 changes/ticket23846 |  5 +++++
 configure.ac        | 10 +++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)