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.

diff --cc src/or/config.c
index 2a8c54096832407705a500fc9475a120aef59e0b,1e7bd5844b2906c4f11b5776dff8ff039b3a44f6..2ce930bd728ef22febcb5d1ffd273fb65720dde1
--- 1/src/or/config.c
--- 2/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);
  }
  

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

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