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

[nickm at torproject.org]

commit 2e3645d0268d9f22e694dbf7850b0b95b68d8924
Merge: 4ed142a 528dcd1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 1 15:38:48 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(-)