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

[nickm at torproject.org]

commit 5822496d69f670766b97b59bf3b2963d9bd6f37f
Merge: ff0db77f9 0694a6dc0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 4 15:56:17 2017 -0500

    Merge branch 'ticket24518'

 changes/ticket24518          | 4 ++++
 src/rust/tor_rust/include.am | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)