commit c7cbd06d5f2727c3742dfd426223f1f1ebe46f94 Merge: 341c6a5 5fed1ccd Author: Roger Dingledine arma@torproject.org Date: Sun Apr 1 16:03:16 2012 -0400

Merge branch 'maint-0.2.2'

Conflicts: src/or/config.c

doc/tor.1.txt | 7 +++++-- src/or/config.c | 6 +++--- src/or/directory.c | 5 +++-- src/or/or.h | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-)

diff --cc src/or/config.c index 2ce930b,fbbd902..24edc4d --- a/src/or/config.c +++ b/src/or/config.c @@@ -808,12 -713,7 +808,12 @@@ or_options_free(or_options_t *options return;

routerset_free(options->_ExcludeExitNodesUnion); + if (options->NodeFamilySets) { + SMARTLIST_FOREACH(options->NodeFamilySets, routerset_t *, + rs, routerset_free(rs)); + smartlist_free(options->NodeFamilySets); + } - tor_free(options->BridgePassword_AuthDigest); + tor_free(options->_BridgePassword_AuthDigest); config_free(&options_format, options); }