From bb21d14255c2f5c94173dda2ba30c83478044779 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 24 Jan 2014 12:56:10 -0500
Subject: Apply StrictNodes to hidden service directories early

Previously, we would sometimes decide in directory_get_from_hs_dir()
to connect to an excluded node, and then later in
directory_initiate_command_routerstatus_rend() notice that it was
excluded and strictnodes was set, and catch it as a stopgap.

Additionally, this patch preferentially tries to fetch from
non-excluded nodes even when StrictNodes is off.

Fix for bug #10722. Bugfix on 0.2.0.10-alpha (the v2 hidserv directory
system was introduced in e136f00ca). Reported by "mr-4".
---
 changes/bug10722 | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 changes/bug10722

(limited to 'changes/bug10722')

diff --git a/changes/bug10722 b/changes/bug10722
new file mode 100644
index 000000000..dd4711f11
--- /dev/null
+++ b/changes/bug10722
@@ -0,0 +1,8 @@
+  o Minor bugfixes:
+    - Consider non-excluded hidden service directory servers before
+      excluded ones. Do not consider excluded hidden service directory
+      servers at all if StrictNodes was set.  (Previously, we would
+      sometimes decide to connect to those servers, and then realize
+      before we initiated a connection that we had excluded them.)
+      Fix for bug #10722. Bugfix on 0.2.0.10-alpha. Reported by
+      "mr-4".
-- 
cgit v1.2.3