commit c59e04b51188a5bf3c57a9182a04feb9ace51d4d Merge: 9b3b49f f62c74c Author: Nick Mathewson <nickm@torproject.org> Date: Mon Dec 19 10:12:17 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(-)