[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4

commit 85d6b41d2c4af4f49e771f0b79f5191aa40c8ff7 Merge: ab57cf649 d7ad6d924 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 9 15:18:09 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)