Lintchanges some more.

10 files changed, 21 insertions, 58 deletions

diff --git a/changes/bug13718-add-internal-bootstrap-statuses b/changes/bug13718-add-internal-bootstrap-statuses
index d3e9a7709c..add2e8ef07 100644
--- a/changes/bug13718-add-internal-bootstrap-statuses
+++ b/changes/bug13718-add-internal-bootstrap-statuses
@@ -1,4 +1,4 @@
-  o Minor bugfixes:
+  o Minor bugfixes (Testing networks):
     - Add "internal" to some bootstrap statuses when no exits are available.
       If the consensus does not contain Exits, Tor will only build internal
       circuits. In this case, relevant statuses will contain the word
@@ -6,4 +6,4 @@
       completes, Tor will be ready to handle an application requesting an
       internal circuit to hidden services at ".onion" addresses.
       If a future consensus contains Exits, exit circuits may become available.
-      Consequential change from #13718.
+      Fixes part of bug 13718; bugfix on 0.2.4.10-alpha. Patch by "teor".
diff --git a/changes/bug13718-avoid-excluding-guards b/changes/bug13718-avoid-excluding-guards
index bf80d2a7e7..8bb4fa311f 100644
--- a/changes/bug13718-avoid-excluding-guards
+++ b/changes/bug13718-avoid-excluding-guards
@@ -1,8 +1,8 @@
-  o Minor bugfixes:
+  o Minor bugfixes (Test networks):
     - Avoid excluding guards from path building in minimal test networks,
       when we're in a test network, and excluding guards would exclude
       all nodes. This typically occurs in incredibly small tor networks,
       and those using TestingAuthVoteGuard *
       This fix only applies to minimal, testing tor networks,
       so it's no less secure.
-      Discovered as part of #13718.
+      Fixes part of bug 13718; bugfix on 0.1.1.11-alpha. Patch by "teor".
diff --git a/changes/bug13718-check-consensus-exits b/changes/bug13718-check-consensus-exits
deleted file mode 100644
index 5ca4b115eb..0000000000
--- a/changes/bug13718-check-consensus-exits
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor enhancement:
-    - Check if there are exits in the consensus.
-      Add router_have_consensus_path() which reports whether
-      the consensus has exit paths, internal paths, or whether it
-      just doesn't know.
-      Used by #13718 and #13814.
diff --git a/changes/bug13718-make-nodelist-args-readable b/changes/bug13718-make-nodelist-args-readable
deleted file mode 100644
index 7377a81d38..0000000000
--- a/changes/bug13718-make-nodelist-args-readable
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor refactoring:
-    - Refactor count_usable_descriptors to use named enums for exit_only.
-      count_usable_descriptors now uses named exit_only values:
-       *  USABLE_DESCRIPTOR_ALL
-       *  USABLE_DESCRIPTOR_EXIT_ONLY
-    - Add debug logging code for descriptor counts.
-      This resolves nickm's request in bug 13718 to improve argument
-      readability.
diff --git a/changes/bug13814-avoid-exit-paths-no-exits b/changes/bug13814-avoid-exit-paths-no-exits
index 8b0446f5f0..82761214b8 100644
--- a/changes/bug13814-avoid-exit-paths-no-exits
+++ b/changes/bug13814-avoid-exit-paths-no-exits
@@ -1,25 +1,8 @@
-  o Minor bugfixes:
-    - Avoid building exit circuits from a consensus with no exits
-      Tor can now build circuits from a consensus with no exits.
-      But if it tries to build exit circuits, they fail and flood the logs.
-      The circuit types in the Exit Circuits list below will only be
-      built if the current consensus has exits. If it doesn't,
-      only the Internal Circuits will be built. (This can change
-      with each new consensus.)
-      Fixes bug #13814, causes fewer path failures due to #13817.
+  o Minor features (Testing networks):
+    - Avoid building exit circuits from a consensus with no exits.
+      Now thanks to our fix for 13718,
+      we accept a no-exit network as not wholly lost, but
+      we need to remember not to try to build exit circuits on it.
+      Closes ticket 13814;
+      patch by "teor".
 
-      Exit Circuits:
-        Predicted Exit Circuits
-        User Traffic Circuits
-        Most AP Streams
-        Circuits Marked Exit
-        Build Timeout Circuits (with exits)
-
-      Internal Circuits:
-        Hidden Service Server Circuits
-        Hidden Service Client Circuits
-        Hidden Service AP Streams
-        Hidden Service Intro Point Streams
-        Circuits Marked Internal
-        Build Timeout Circuits (with no exits)
-        Other Circuits?
diff --git a/changes/bug13814-reachability-without-exits b/changes/bug13814-reachability-without-exits
index 43a326b847..07f2d8ae37 100644
--- a/changes/bug13814-reachability-without-exits
+++ b/changes/bug13814-reachability-without-exits
@@ -1,15 +1,9 @@
-  o Minor bugfixes:
-    - Allow tor to build circuits using a consensus with
+  o Minor bugfixes (Testing networks):
+    - Allow Tor to build circuits using a consensus with
       no exits. If the consensus has no exits (typical of
-      a bootstrapping test network), allow tor to build
+      a bootstrapping test network), allow Tor to build
       circuits once enough descriptors have been
       downloaded.
-      When there are no exits, we always have "enough"
-      exit descriptors. (We treat the proportion of
-      available exit descriptors as 100%.)
       This assists in bootstrapping a testing Tor
       network.
-      Fixes bug 13718.
-      Makes bug 13161's TestingDirAuthVoteExit
-      non-essential.
-      (But still useful for speeding up a bootstrap.)
+      Fixes bug 13718; bugfix on 0.2.4.10-alpha. Patch by "teor".
diff --git a/changes/bug13823-decrease-consensus-interval b/changes/bug13823-decrease-consensus-interval
index 67f0b9fe62..cc0e6c7c61 100644
--- a/changes/bug13823-decrease-consensus-interval
+++ b/changes/bug13823-decrease-consensus-interval
@@ -6,4 +6,4 @@
       This assists in quickly bootstrapping a testing
       Tor network.
       Fixes bugs 13718 and 13823; bugfix on 0.2.0.3-alpha.
-
+      Patch by "teor".
diff --git a/changes/bug13839-fix-TestingMinExitFlagThreshold b/changes/bug13839-fix-TestingMinExitFlagThreshold
index e0fa270243..86315de1f6 100644
--- a/changes/bug13839-fix-TestingMinExitFlagThreshold
+++ b/changes/bug13839-fix-TestingMinExitFlagThreshold
@@ -3,6 +3,5 @@
       TestingTorNetwork. Instead, when TestingMinExitFlagThreshold is 0,
       ignore exit bandwidthcapacity.
       This assists in bootstrapping a testing Tor network.
-      Fixes bugs parts of bugs 13718 and 13839;
-      Makes bug 13161's TestingDirAuthVoteExit non-essential.
-      Bugfix on 0.2.0.3-alpha.
+      Fixes parts of bugs 13718 and 13839;
+      bugfix on 0.2.0.3-alpha. Patch by "teor".
diff --git a/changes/bug13924-fix-testing-reachability b/changes/bug13924-fix-testing-reachability
index 914a159007..e10dda81a3 100644
--- a/changes/bug13924-fix-testing-reachability
+++ b/changes/bug13924-fix-testing-reachability
@@ -1,7 +1,7 @@
-  o Minor bugfixes:
+  o Minor bugfixes (Testing networks)
     - Stop assuming that private addresses are local when checking
       reachability in a TestingTorNetwork. Instead, when testing, assume
       all OR connections are remote. (This is necessary due to many test
       scenarios running all nodes on localhost.)
       This assists in bootstrapping a testing Tor network.
-      Fixes bugs 13718 & 13924.
+      Fixes bug 13924; bugfix on 0.1.0.1-rc. Patch by "teor".
diff --git a/changes/bug13963-decrease-if-modified-since-delay b/changes/bug13963-decrease-if-modified-since-delay
index d4bbc1bbd4..26bda82ac4 100644
--- a/changes/bug13963-decrease-if-modified-since-delay
+++ b/changes/bug13963-decrease-if-modified-since-delay
@@ -5,3 +5,4 @@
       interval is very short.
       This assists in bootstrapping a testing Tor network.
       Fixes parts of bugs 13718 and 13963; bugfix on 0.2.0.3-alpha.
+      Patch by "teor".
\ No newline at end of file