commit b66f4cfc9dfdde9e233424ba4c9c25127adc3435
Merge: 5dce182 97330ce
Author: Nick Mathewson <[email protected]>
Date: Thu May 28 14:06:01 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6'
changes/bug16030 | 3 +++
changes/bug16212 | 5 +++++
src/common/sandbox.c | 10 ++++++++++
src/test/test_channel.c | 2 +-
4 files changed, 19 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
