commit 67f0b51c9239dd1d2318007e3f503d4e09c3097b Merge: 976f392 8378a33 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 19 11:20:03 2015 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

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