commit 514212ed660a85d27dc285874971636f543235f1 Merge: df16f89a8 4f7955d5d Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 1 14:39:08 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(-)