Merge branch 'maint-0.2.2'

Conflicts:
	src/or/config.c

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/config.c
index 2ce930bd728ef22febcb5d1ffd273fb65720dde1,fbbd9029f7ccf35718385f18d78574aa428108fe..24edc4d79359ee03d3f7ca973289fa4565b6cb8a
--- 1/src/or/config.c
--- 2/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);
-   tor_free(options->BridgePassword_AuthDigest);
 +  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);
  }
  

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/or.h
Simple merge