[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 1f7b9e61ce3da7f19bdb44d4a9c5ec33da4cf083
Merge: 37e3fb8 69ff26b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 12:18:39 2011 -0400

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

 changes/bug3026    |    4 ++++
 src/or/directory.c |    5 +++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --cc src/or/directory.c
index c0378a4,347ed42..e62c2f3
--- 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.",