[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/179'

[nickm at torproject.org]

commit f608cc0f31d6fc99f4059d14adeba286ea82b808
Merge: baff5e2b9 7585523cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 13 18:30:17 2018 -0400

    Merge remote-tracking branch 'tor-github/pr/179'

 changes/ticket26492                   |  4 +++
 src/rust/protover/ffi.rs              | 62 +++++++++++++++++------------------
 src/rust/tor_allocate/tor_allocate.rs | 12 +++----
 3 files changed, 40 insertions(+), 38 deletions(-)