commit 81b5483ee6167f8ea176ca33fa9c8deed684fb32 Merge: 99f9816ef f5e3bcb60 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 9 15:18:09 2018 -0400 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(-)