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

[nickm at torproject.org]

commit 24bc8caf35818bda598f53a3a294b0920d3d3bf6
Merge: e14006a 1a7af74
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 14:06:56 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(-)