commit d084d3246b1e8cc4438287382abc86655b103601 Merge: d499a5a70 a7e777ab8 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Nov 22 08:34:48 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(-)