commit e4b68abd5accdf41c71644eb728ca42991bf632a Merge: c6365055a 5da6120e8 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 21 12:54: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(-)