commit 7257d41aa76c3a65dd4311c92699df34e7591de2 Merge: 3e46331 6ec3228 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 3 09:38:21 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(-)