commit b594455ddd5761683a127b4d45f2cf1055cf72eb Merge: 5cb83c942 23c5259a3 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 18 14:40:55 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(-)