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

[nickm at torproject.org]

commit 2b716e85993898f6347ff1a4b904d017b4410793
Merge: f1cbb09e3 f2ecdeb72
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 30 12:28:39 2017 -0500

    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(-)