commit 01d6e23f767a029cc77cbe59b80046fcaad8401e Merge: 9e8b762fc 34c6034aa Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 9 10:13:54 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(-)