[tor-commits] [tor/master] Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'

[nickm at torproject.org]

commit aac732322ae132a1659ecbd4039c7d017ddc3d20
Merge: 14d5e7f f9c1ba6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 12 17:12:43 2013 -0400

    Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'

 changes/seccomp2_sandbox |   12 ++
 configure.ac             |    6 +
 doc/tor.1.txt            |    5 +
 src/common/include.am    |    1 +
 src/common/log.c         |   16 +++
 src/common/sandbox.c     |  328 ++++++++++++++++++++++++++++++++++++++++++++++
 src/common/sandbox.h     |   55 ++++++++
 src/common/torlog.h      |    1 +
 src/or/config.c          |    4 +
 src/or/main.c            |    9 ++
 src/or/or.h              |    1 +
 11 files changed, 438 insertions(+)