commit fa66e8a6541b622a19bdd0d0b3f288f552b42eb0 Merge: 7a74d5a87 a8bab72c3 Author: Nick Mathewson nickm@torproject.org Date: Mon Aug 6 08:29:24 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(-)