[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

[nickm at torproject.org]

commit 4d73ed10c40938d1ef1cf5628fd1840ee64df8ff
Merge: 700c654d7 6ce8cc5db
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 09:29:00 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(-)