commit 078604630dad7edc57cc9378102de65f06586efd Merge: 8669a1ea5 743eee493 Author: Nick Mathewson <[email protected]> Date: Tue Oct 24 09:10:42 2017 -0400
Merge branch 'maint-0.2.5' into release-0.2.5
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
