commit a172303484aa23d420bdc1055c00c09830dce863 Merge: 43a0ae3 31b79f0 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 26 13:30:44 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(-)