commit b58faf1717fafbe6d6528f4ba65fc1a612721069 Merge: 31e7b47 d47c52b Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 8 11:02:57 2016 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)