commit f5fea59342a5c7fb8129d5157e5e5ceead9ac6ef Merge: 8465a8d84 4c1c818ff Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 24 16:50:32 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(-)