commit c552ce0e17f26ae00d781d7e7f88bf2cb530573b Merge: 7444f2d 98ffb2e Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 29 16:35:46 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(-)