commit 4f5ea89c117c66def603bc6f4d046e2142a76467 Merge: 248056d9d ea47563dd Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 7 10:23:40 2019 -0500 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(-)