commit 0c8eebd90c5e745bb60339bea6fee79f19d0d6fd Merge: 89ed93e46 c7d1d1ad2 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 7 13:22:47 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(-)