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

[nickm at torproject.org]

commit d9dd67e2169c70e32e833d1e4d93bf83d363def7
Merge: 0a78d29 77c5d8c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:29:49 2017 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

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