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

[nickm at torproject.org]

commit c4ecb8f86765b75f6fd667dfec36eb1ee518f81a
Merge: efc306c59 fd0a894d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 5 10:20:42 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 configure.ac                        | 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)