commit 9eb17cb7ba85283acd7be686b2e5b2aa7b89bdf2 Merge: c981cd431 424ab08b5 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 30 12:28:39 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)