commit 2a20f8e51a71b5e3ee25d8d2e7908be39e72ba8e Merge: d15a7a27b aec505a31 Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 3 11:34:10 2018 -0500

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(-)