commit 81a1d7eb86e47e393eca7e4a2fd73ec340d6645e Merge: 5030edfb5 955ca72f9 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 21 13:25:39 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)