commit fa6a228ce86c2737447f32c78eedc00083eb826c Merge: 1cdb839 3a0d42f Author: Nick Mathewson <ni...@torproject.org> Date: Tue Jun 14 20:36:40 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(-) _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits