commit 7b792b990c49ddbca782ee342bc6b0805b3f0868 Merge: 801af9a7e b5fdb91ad Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 7 21:18:47 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(-)