commit 50db1e825d0508e983961f6783e7e2db831d085a Merge: 528d3e1 3dfecff Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 7 16:38:58 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(-)