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

[nickm at torproject.org]

commit ca8423a703803db860ee39906f8b5d362e0f64f2
Merge: 778e8e6 f930824
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 22 10:08:50 2016 -0400

    Merge remote-tracking branch 'public/bug18253'

 changes/bug18253     |  3 ++
 src/common/sandbox.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 src/common/sandbox.h |  3 ++
 src/or/connection.c  | 13 ++++++--
 src/or/main.c        | 14 +++++++++
 5 files changed, 118 insertions(+), 3 deletions(-)