commit 03539b76cf23b4a119b8babf643679ebabda0dd0 Merge: 2e3c529 d9427c0 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 29 18:48:32 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(-)