commit cac5949697ba1686fd3c5f3b17960273815a6a93 Merge: 4fe253e 25f0eb4 Author: Nick Mathewson nickm@torproject.org Date: Sun Feb 2 15:48:27 2014 -0500

Merge branch 'feature_10582'

changes/10582_tproxy | 7 +++++++ doc/tor.1.txt | 13 +++++++++++++ src/common/sandbox.c | 8 ++++++++ src/or/config.c | 19 +++++++++++++++---- src/or/connection.c | 15 +++++++++++++++ src/or/or.h | 2 ++ 6 files changed, 60 insertions(+), 4 deletions(-)