commit 39c056e207f6a0c624139bb7bdd8ad7e2810374c Merge: c4e63b6 eb41214 Author: Nick Mathewson <[email protected]> Date: Mon Apr 6 10:00:45 2015 -0400
Merge branch 'maint-0.2.6' into release-0.2.6
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
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
