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

[nickm at torproject.org]

commit 27b04b8bad295157a92fdd59d0c3e09bc360a84a
Merge: e5e3f1364 6e3ec8222
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Dec 1 09:35:43 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(-)