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

[nickm at torproject.org]

commit 5ac469d795aebb5f77090648969c9eb7f7133015
Merge: cdb58af 8e439a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 09:29:48 2017 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

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