commit 4c015d9fe4abf54f5e3d8929fa62b916789e158f Merge: 37fba82c1 93b3c4b84 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 13 12:06:52 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(-)