[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 341c6a59db09a43ee2301a6c59158b09ec55134b
Merge: 458718d 9a69c24
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Apr 1 00:46:52 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/config.c
    
    Conflict was in or_options_free, where two newly added fields had free
    calls in the same place.

 changes/bridgepassword |   11 +++++++++++
 src/or/config.c        |   19 +++++++++++++++++++
 src/or/directory.c     |   11 ++++++-----
 src/or/or.h            |    7 ++++---
 4 files changed, 40 insertions(+), 8 deletions(-)

diff --cc src/or/config.c
index 2a8c540,1e7bd58..2ce930b
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -808,11 -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);
    config_free(&options_format, options);
  }