commit 47e87f2be2d96cc28bcded94bfbc94a750bf32d4 Merge: e8cda9144 495db72c1 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 1 09:35:43 2017 -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(-)