commit 11336cfa0997709176bc912fde71338eaeab3851 Merge: 63b84335d 94c59851d Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 21 14:23:06 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(-)