[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11970'

[nickm at torproject.org]

commit 6f20dd7bfc256e650b0d04f70f06c9837b90158d
Merge: e8dd34f b883b8d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 11 11:01:52 2014 -0400

    Merge remote-tracking branch 'public/bug11970'

 changes/bug11970     |    7 +++
 src/common/address.c |    2 +-
 src/common/sandbox.c |  160 +++++++++++++++++++++++++++++++++++++-------------
 src/common/sandbox.h |   20 ++-----
 src/or/main.c        |    1 +
 5 files changed, 134 insertions(+), 56 deletions(-)