commit 62ead6d3268b557e17aefc96a7345e46d22f2d53 Merge: a3e0763 70d3985 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 2 11:20:34 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

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