From: Roger Dingledine <arma@torproject.org>
Date: Sun, 1 Apr 2012 20:03:16 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.14-alpha~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7cbd06d5f2727c3742dfd426223f1f1ebe46f94;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'

Conflicts:
	src/or/config.c
---

c7cbd06d5f2727c3742dfd426223f1f1ebe46f94
diff --cc src/or/config.c
index 2ce930bd72,fbbd9029f7..24edc4d793
--- 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);
  }