commit 53d4c505cda3e129092366f863ce16a4ad192cfa Merge: 31df6a7 ad1824f Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 22 15:37:12 2016 -0400

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(-)