commit 49bdcfd4b6f392e6c0f15e6beaec7a7498aadc88 Merge: 054c1d5 24318fb Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 19 08:08:52 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(-)