[tor-commits] [tor/master] Merge branch 'confparse_refactor_squashed'

[nickm at torproject.org]

commit abbde7b1849768c96b3ebf2e08e4f844c0775b9d
Merge: 582f218 7d11952
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 12:25:45 2012 -0400

    Merge branch 'confparse_refactor_squashed'

 changes/refactor_config |    3 +
 src/or/circuitbuild.c   |    2 +
 src/or/config.c         | 1914 +----------------------------------------------
 src/or/config.h         |   12 +-
 src/or/confparse.c      | 1226 ++++++++++++++++++++++++++++++
 src/or/confparse.h      |  132 ++++
 src/or/control.c        |    1 +
 src/or/dirserv.c        |    1 +
 src/or/hibernate.c      |    1 +
 src/or/include.am       |    6 +-
 src/or/main.c           |    2 +
 src/or/router.c         |    1 +
 src/or/statefile.c      |  606 +++++++++++++++
 src/or/statefile.h      |   22 +
 src/or/transports.c     |    1 +
 src/test/test_config.c  |    1 +
 16 files changed, 2016 insertions(+), 1915 deletions(-)