Merge remote-tracking branch 'origin/maint-0.2.2'

diff --cc src/or/directory.c
index c0378a419ffd0ae26255897a7e8fb6a64adb12af,347ed42cb8a984a492d844c2edce0df0abf7891c..e62c2f3f0fe489ce399bd78d409d748b987fcccb
--- 1/src/or/directory.c
--- 2/src/or/directory.c
+++ b/src/or/directory.c
@@@ -301,8 -293,11 +303,11 @@@ directory_post_to_dirservers(uint8_t di
        if ((type & ds->type) == 0)
          continue;
  
+       if (exclude_self && router_digest_is_me(ds->digest))
+         continue;
+ 
        if (options->ExcludeNodes && options->StrictNodes &&
 -          routerset_contains_routerstatus(options->ExcludeNodes, rs)) {
 +          routerset_contains_routerstatus(options->ExcludeNodes, rs, -1)) {
          log_warn(LD_DIR, "Wanted to contact authority '%s' for %s, but "
                   "it's in our ExcludedNodes list and StrictNodes is set. "
                   "Skipping.",