commit fe7a0c34b05db5f4a8a91353c1615ab9cde33095 Merge: 5d68e5b b838e1f Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 19 08:07:37 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(-)