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

[nickm at torproject.org]

commit cf9844fcfa5387e054dff55d5ad0bfd538b4cec3
Merge: d6b6257 58908b6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 28 10:40:20 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(-)