commit 03b91ac8c9b082430ba466ef72ef0c6ca594e698 Merge: 63d0426 d389480 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 8 09:29:49 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

changes/trove-2017-004 | 2 -- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-)