commit 5a64f42f91bf4371903cecc34fe8118fae0a4aad Merge: a5b953a a931d15 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 7 12:43:59 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(-)