commit 881307dc77a7a6ff37a669c2317ab0bd691e24d1 Merge: eebf93dfd e46849846 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 14 13:22:17 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(-)