commit 6d728ba8801031b27937436cbcad033f4406a8b5 Merge: 5b55778 47760c7 Author: Nick Mathewson <[email protected]> Date: Mon Dec 22 15:58:49 2014 -0500
Merge remote-tracking branch 'public/bug14013_024' into maint-0.2.5
src/common/crypto.c | 6 ++++++
src/common/util.c | 3 +++
2 files changed, 9 insertions(+)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
