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

[nickm at torproject.org]

commit ef592d1331f037f474cc0674a9c9ff3eeb7069f0
Merge: 83389502e 9c294d29e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 1 12:09:04 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(-)