commit 7cbda1181deec55984e7b60a795082daf65d3d25 Merge: 940308f49 c8859582a Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 8 16:45:15 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(-)