[tor-commits] [tor/master] Merge branch '10267_plus_10896_rebased_twice'

[nickm at torproject.org]

commit 973661394abc393e3dfd5b82de86659ecadc72a4
Merge: 211b8cc f9719b0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 16 23:03:41 2014 -0400

    Merge branch '10267_plus_10896_rebased_twice'

 changes/10267_tproxy     |    4 +++
 changes/10896            |    8 +++++
 doc/tor.1.txt            |   17 +++++++---
 src/or/config.c          |   15 ++++++++-
 src/or/connection_edge.c |   82 +++++++++++++++++++++++++++++++++++++++-------
 src/or/or.h              |    7 +++-
 6 files changed, 115 insertions(+), 18 deletions(-)