commit 11f8342586f15d22aeef5d6cfb74513c4704315b Merge: 5eb2786 06fe8a1 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 5 10:03:18 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(-)