commit e0fa07c06fc1a8761b5f4b33028f157a130831a4 Merge: b6024ec 18ee193 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 20 10:27:51 2015 -0500

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