commit 2f173ce44237a3917ad1d214e3e1fceb680e4c7f Merge: a204a919f 2e9e91ebb Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 29 11:24:22 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)