commit 4d308789e2133261e30b0dac8c31a5517ac2fd3f Merge: 0ad731710 7bebd1b02 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 24 09:11:38 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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