commit e3f4a96528ad52c480a360bf7782446f5a06f622 Merge: 6c4a26b 7760916 Author: Roger Dingledine <[email protected]> Date: Mon Jul 28 04:14:39 2014 -0400
Merge branch 'maint-0.2.5'
Conflicts:
configure.ac
contrib/win32build/tor-mingw.nsi.in
src/win32/orconfig.h
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
