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

[nickm at torproject.org]

commit b2cab96029e2ea477215690d0bb403565e13ac56
Merge: f833164 ec3ce77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 14:06:56 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(-)