commit 1a05d9047d0cc25cbe13a07da7bcf3faf38fc99b Merge: 6b6ad81 8384f4d Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 12 08:24:42 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(-)