[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

commit 06b9f75f3ee435c8bfe5148ffb13f7c0e23d8af3 Merge: 2630886 e9124b8 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Aug 24 14:46:13 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(-)