commit dc624a7db11b618d858149e68f9f2114a9d17713 Merge: d7b843c f258064 Author: Nick Mathewson nickm@torproject.org Date: Thu May 26 21:09:09 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(-)