[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'isis/bug26245' into maint-0.3.4

[nickm at torproject.org]

commit 530d67410fab43e8a76544d05e4a50bdd526bca6
Merge: 9dd45456f 748a0c7d0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 16 10:19:26 2018 -0400

    Merge remote-tracking branch 'isis/bug26245' into maint-0.3.4

 configure.ac                       |  6 ++++++
 src/rust/.cargo/config.in          |  3 +++
 src/rust/external/crypto_digest.rs | 10 +++-------
 3 files changed, 12 insertions(+), 7 deletions(-)