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

[nickm at torproject.org]

commit 71ddfbaadd9802ae935208191fbe2605d9146491
Merge: 3dd94a7ea ac5b1428e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 16 12:43:28 2018 -0400

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

 configure.ac                        | 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/rust/crypto/lib.rs              | 1 +
 src/win32/orconfig.h                | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)