commit 75e22561a126d4d37162ce849adac7c01796a45c Merge: 47d2e4f 7ae7e3c Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 26 15:37:38 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

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