[tor-commits] [tor/master] Merge branch 'bug17347'

[nickm@xxxxxxxxxxxxxx]

commit fa4a81518a92e8e414c3911e480cfcc2175cb6b6
Merge: 4e5e93a 50148dc
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Oct 15 10:36:29 2015 -0400

    Merge branch 'bug17347'

 changes/bug17347     |    4 ++++
 src/common/sandbox.c |    2 +-
 src/common/sandbox.h |    3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits