commit b7613e05433eff605fb2ac19125711f82795c8da Merge: 2f7c10d 9e297f8 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 1 13:36:53 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(-)