commit 97cc61e9476d6553e65ade578cc57a029674ee5a Merge: 8c1e2d755 3dd94a7ea Author: Nick Mathewson nickm@torproject.org Date: Sat Jun 16 10:20:27 2018 -0400

Merge branch 'maint-0.3.4'

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