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

[nickm at torproject.org]

commit 765fd0845f58dee27e48a1a786e9dacb00663616
Merge: 5a0e73c75 82f8b27ff
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 09:29:00 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(-)