From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 15 May 2011 16:18:39 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f7b9e61ce3da7f19bdb44d4a9c5ec33da4cf083;p=thirdparty%2Ftor.git

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

1f7b9e61ce3da7f19bdb44d4a9c5ec33da4cf083
diff --cc src/or/directory.c
index c0378a419f,347ed42cb8..e62c2f3f0f
--- a/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.",