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

[nickm at torproject.org]

commit 5f41bc91c6817649ebcfbecd184640aad7a5c8f1
Merge: ebbb0348d 56c1fbf33
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 26 17:02:06 2018 -0400

    Merge branch 'ticket26439'

 changes/ticket26439 | 3 +++
 configure.ac        | 7 +++++++
 src/test/include.am | 1 -
 3 files changed, 10 insertions(+), 1 deletion(-)