[tor-commits] [tor/master] Merge remote-tracking branch 'isis-github/bug26109'

[nickm at torproject.org]

commit 2d2cfbcd81f9bcdf1097f58b76e8be22456bc5a2
Merge: 7f37ba825 4c21d4140
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 09:13:27 2018 -0400

    Merge remote-tracking branch 'isis-github/bug26109'

 src/rust/crypto/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)