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

[nickm at torproject.org]

commit 647fa4bdf4b499fbe2bb8d2f8ce127ca9134481b
Merge: bd62f78 d1340bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 18 12:28:34 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(-)