commit abe5b07c13bb6442c14b1b71c5df75d846095c37 Merge: c33db290a 8925e84be Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 2 12:29:42 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(-)