From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 1 Apr 2012 04:46:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.14-alpha~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=341c6a59db09a43ee2301a6c59158b09ec55134b;p=thirdparty%2Ftor.git

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.
---

341c6a59db09a43ee2301a6c59158b09ec55134b
diff --cc src/or/config.c
index 2a8c540968,1e7bd5844b..2ce930bd72
--- 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);
  }