commit 70840ea6d53c4bbfd202ce3c83ea398e5a68822b Merge: e9d45f6 4bab288 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 10:21:58 2017 -0500

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(-)