[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

commit 2d42648eaf0bfbf66957a427ff503d5d47d03bc5 Merge: 31cc63deb 0026d1a67 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Mar 3 11:34:10 2018 -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(-)