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

[nickm at torproject.org]

commit 695425db0c9b44b52e7ee456684f79b0ca35d12e
Merge: 1fbd1e5 8324631
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 15 18:25:12 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(-)