[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/task-6752-3'

[nickm at torproject.org]

commit d3125a3e404f4967d9100d793b01dcbed6eeadc2
Merge: e7134c2 3795f6a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 28 10:59:35 2013 -0400

    Merge remote-tracking branch 'karsten/task-6752-3'

 changes/bug6752        |    5 ++
 doc/tor.1.txt          |   61 ++++++++++++++++++++
 src/common/container.c |   19 +++++++
 src/common/container.h |    1 +
 src/or/config.c        |  147 ++++++++++++++++++++++++++++++++++++------------
 src/or/confparse.c     |   54 ++++++++++++++++++
 src/or/confparse.h     |    3 +
 src/or/directory.c     |   88 +++++++++--------------------
 src/or/main.c          |    8 +--
 src/or/microdesc.c     |    2 +-
 src/or/networkstatus.c |    4 +-
 src/or/or.h            |   53 ++++++++++++++---
 src/or/routerlist.c    |   19 ++-----
 13 files changed, 338 insertions(+), 126 deletions(-)