commit 10206b25d390720d0a5a5904ee6cbc3cc5552af2 Merge: 1bc35c59f 15f6201a5 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 1 16:44:31 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(-)