commit 8eaa8631794cce7d4a5f0713360cbc3bbaf4b199 Merge: 2d279eaa9 63eed6edf Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 7 10:23:40 2019 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)