commit 58474f7bb1e13ca61a0e52f13d8502cc334813bb Merge: 5ff2d8d77 1f7f930f9 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 8 11:39:48 2018 -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(-)