Start a changelog for 0.4.2.1-alpha

This commit sorts the changes files using sortChanges, and inserts
them into a changelog entry.

82 files changed, 402 insertions, 368 deletions

diff --git a/ChangeLog b/ChangeLog
index 637a1dfcd0..721604c65b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,405 @@
+Changes in version 0.4.2.1-alpha - 2019-09-??
+
+  o Major features (developer tools):
+    - Our best-practices tracker now integrates with our include-checker tool
+      to keep track of the layering violations that we have not yet fixed.
+      We hope to reduce this number over time to improve Tor's modularity.
+      Closes ticket 31176.
+
+  o Major features (onion service v3, denial of service):
+    - Add onion service introduction denial of service defenses. They consist of
+      rate limiting client introduction at the intro point using parameters that
+      can be sent by the service within the ESTABLISH_INTRO cell. If the cell
+      extension for this is not used, the intro point will honor the consensus
+      parameters. Closes ticket 30924.
+
+  o Major bugfixes (circuit build, guard):
+    - When considering upgrading circuits from "waiting for guard" to "open",
+      always ignore the ones that are mark for close. Else, we can end up in
+      the situation where a subsystem is notified of that circuit opening but
+      still marked for close leading to undesirable behavior. Fixes bug 30871;
+      bugfix on 0.3.0.1-alpha.
+
+  o Major bugfixes (crash, android):
+    - Tolerate systems (including some Android installations) where madvise
+      and MADV_DONTDUMP are available at build-time, but not at run time.
+      Previously, these systems would notice a failed syscall and abort.
+      Fixes bug 31570; bugfix on 0.4.1.1-alpha.
+
+  o Major bugfixes (crash, Linux):
+    - Tolerate systems (including some Linux installations) where madvise
+      and/or MADV_DONTFORK are available at build-time, but not at run time.
+      Previously, these systems would notice a failed syscall and abort.
+      Fixes bug 31696; bugfix on 0.4.1.1-alpha.
+
+  o Minor feature (onion service v3):
+    - Do not allow single hop client to fetch or post an HS descriptor from an
+      HSDir. Closes ticket 24964;
+
+  o Minor feature (onion service):
+    - Disallow single hop clients to introduce directly at the introduction
+      point. We've removed Tor2web a while back and rendezvous are blocked at
+      the relays. This is to remove load off the network from spammy clients.
+      Close ticket 24963.
+
+  o Minor feature (token bucket):
+    - Implement a generic token bucket that uses a single counter. This will be
+      useful for the anti-DoS onion service work. Closes ticket 30687.
+
+  o Minor features (best practices tracker):
+    - Add a TOR_PRACTRACKER_OPTIONS variable for passing arguments
+      to practracker from the environment. We may want this for
+      continuous integration. Closes ticket 31309.
+    - Give a warning rather than an error when a practracker exception is
+      violated by a small amount; add a --list-overbroad option to
+      practracker that lists exceptions that are stricter than they need to
+      be, and provide an environment variable for disabling
+      practracker. Closes ticekt 30752.
+
+  o Minor features (build system):
+    - Add --disable-manpage and --disable-html-manual options to configure
+      script. This will enable shortening build times by not building
+      documentation. Resolves issue 19381.
+
+  o Minor features (compilation):
+    - Log a more useful error message when we are compiling and one of the
+      compile-time hardening options we have selected can be linked but
+      not executed. Closes ticket 27530.
+
+  o Minor features (configuration):
+    - The configuration code has been extended to allow splitting
+      configuration data across multiple objects. Previously, all
+      configuration data needed to be kept in a single object, which
+      tended to become bloated.  Closes ticket 31240.
+
+  o Minor features (continuous integration):
+    - When running CI builds on Travis, put some random data in ~/.torrc,
+      to make sure no tests are dependent on default Tor configuration.
+      Resolves issue 30102.
+
+  o Minor features (debugging):
+    - Log a nonfatal assertion failure if we encounter a configuration
+      line whose command is "CLEAR" but which has a nonempty value.
+      This should be impossible, according to the rules of our
+      configuration line parsing. Closes ticket 31529.
+
+  o Minor features (development tools):
+    - Our best-practices tracker now looks at headers as well as
+      C files. Closes ticket 31175.
+
+  o Minor features (git hooks):
+    - Our pre-commit git hook now checks for a special file
+      before running practracker, so that practracker only runs on branches
+      that are based on master. Since the pre-push hook calls the pre-commit
+      hook, practracker will also only run before pushes of branches based
+      on master.
+      Closes ticket 30979.
+
+  o Minor features (git scripts):
+    - Add a "--" command-line argument, to
+      separate git-push-all.sh script arguments from arguments that are passed
+      through to git push. Closes ticket 31314.
+    - Add a -r <remote-name> argument to git-push-all.sh, so the script can
+      push test branches to a personal remote. Closes ticket 31314.
+    - Add a -t <test-branch-prefix> argument to git-merge-forward.sh and
+      git-push-all.sh, which makes these scripts create, merge forward, and
+      push test branches. Closes ticket 31314.
+    - Add a -u argument to git-merge-forward.sh, so that the script can re-use
+      existing test branches after a merge failure and fix.
+      Closes ticket 31314.
+    - Add a TOR_GIT_PUSH env var, which sets the default git push command and
+      arguments for git-push-all.sh. Closes ticket 31314.
+    - Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script
+      push master and maint branches with a delay between each branch. These
+      delays trigger the CI jobs in a set order, which should show the most
+      likely failures first. Also make pushes atomic by default, and make
+      the script pass any command-line arguments to git push.
+      Closes ticket 29879.
+    - Call the shellcheck script from the pre-commit hook.
+      Closes ticket 30967.
+    - Skip pushing test branches that are the same as a remote
+      maint/release/master branch in git-push-all.sh by default. Add a -s
+      argument, so git-push-all.sh can push all test branches.
+      Closes ticket 31314.
+
+  o Minor features (IPv6, logging):
+    - Log IPv6 addresses as well as IPv4 addresses, when describing
+      routerinfos, routerstatuses, and nodes. Closes ticket 21003.
+
+  o Minor features (recommended packages):
+    - No longer include recommended packages in votes as detailed in proposal
+      301. The RecommendedPackages torrc option is deprecated and will no
+      longer have any effect. "package" lines will still be considered when
+      computing consensuses for consensus methods that include them. Fixes
+      ticket 29738.
+
+  o Minor features (stem tests):
+    - Change "make test-stem" so it only runs the stem tests that use tor.
+      This change makes test-stem faster and more reliable.
+      Closes ticket 31554.
+
+  o Minor features (testing):
+    - Add a script to invoke "tor --dump-config" and "tor --verify-config"
+      with various configuration options, and see whether tor's resulting
+      configuration or error messages are what we expect. Use it for
+      integration testing of our +Option and /Option flags.
+      Closes ticket 31637.
+    - Improve test coverage for our existing configuration parsing and
+      management API. Closes ticket 30893.
+
+  o Minor features (tests):
+    - Add integration tests to make sure that practracker gives the outputs
+      we expect. Closes ticket 31477.
+    - The practracker tests are now run as part of the Tor test suite.
+      Closes ticket 31304.
+
+  o Minor bugfixes (best practices tracker):
+    - Fix a few issues in the best-practices script, including tests, tab
+      tolerance, error reporting, and directory-exclusion logic. Fixes bug
+      29746; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (chutney, makefiles, documentation):
+    - "make test-network-all" shows the warnings from each test-network.sh
+      run on the console, so developers see new warnings early. Improve the
+      documentation for this feature, and rename a Makefile variable so the
+      code is self-documenting. Fixes bug 30455; bugfix on 0.3.0.4-rc.
+
+  o Minor bugfixes (compilation):
+    - Add more stub functions to fix compilation on Android with LTO, when
+      --disable-module-dirauth is used. Previously, these compilation
+      settings would make the compiler look for functions that didn't exist.
+      Fixes bug 31552; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (configuration):
+    - Invalid floating-point values in the configuration file are now
+      detected treated as errors in the configuration. Previously, they
+      were ignored and treated as zero. Fixes bug 31475; bugfix on
+      0.0.1.
+
+  o Minor bugfixes (coverity compliance):
+    - Add an assertion when parsing a BEGIN cell so that coverity can be sure
+      that we are not about to dereference a NULL address.
+      Fixes bug 31026; bugfix on 0.2.4.7-alpha.  This is CID
+      1447296.
+
+  o Minor bugfixes (coverity):
+    - In our siphash implementation, when building for coverity, use memcpy
+      in place of a switch statement, so that coverity can tell we are not
+      accessing out-of-bounds memory. Fixes bug 31025; bugfix on
+      0.2.8.1-alpha.  This is tracked as CID 1447293 and 1447295.
+
+  o Minor bugfixes (coverity, tests):
+    - Fix several coverity warnings from our unit tests. Fixes bug 31030;
+      bugfix on 0.2.4.1-alpha, 0.3.2.1-alpha, and 0.4.0.1-alpha.
+
+  o Minor bugfixes (developer tooling):
+    - Only log git script changes in post-merge script when merge was to the
+      master branch. Fixes bug 31040; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (directory authorities):
+    - Return a distinct status when formatting annotations fails.
+      Fixes bug 30780; bugfix on 0.2.0.8-alpha.
+
+  o Minor bugfixes (error handling):
+    - On abort, try harder to flush the output buffers of log messages. On
+      some platforms (macOS), log messages can be discarded when the process
+      terminates. Fixes bug 31571; bugfix on 0.3.5.1-alpha.
+    - Report the tor version whenever an assertion fails. Previously, we only
+      reported the Tor version on some crashes, and some non-fatal assertions.
+      Fixes bug 31571; bugfix on 0.3.5.1-alpha.
+    - When tor aborts due to an error, close log file descriptors before
+      aborting. Closing the logs makes some OSes flush log file buffers,
+      rather than deleting buffered log lines. Fixes bug 31594;
+      bugfix on 0.2.5.2-alpha.
+
+  o Minor bugfixes (git hooks):
+    - Remove a duplicate call to practracker from the pre-push hook.
+      The pre-push hook already calls the pre-commit hook, which calls
+      practracker. Fixes bug 31462; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (git scripts):
+    - Stop hard-coding the bash path in the git scripts. Some OSes don't
+      have bash in /usr/bin, others have an ancient bash at this path.
+      Fixes bug 30840; bugfix on 0.4.0.1-alpha.
+    - Stop hard-coding the tor master branch name and worktree path in the
+      git scripts. Fixes bug 30841; bugfix on 0.4.0.1-alpha.
+
+  o Minor bugfixes (guards):
+    - When tor is missing descriptors for some primary entry guards, make the
+      log message less alarming. It's normal for descriptors to expire, as long
+      as tor fetches new ones soon after. Fixes bug 31657;
+      bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (ipv6):
+    - We check for private IPv6 address alongside their IPv4 equivalents when
+      authorities check descriptors. Previously, we only checked for private
+      IPv4 addresses. Fixes bug 31088; bugfix on 0.2.3.21-rc. Patch by Neel
+      Chauhan.
+    - When parsing microdescriptors, we should check the IPv6 exit policy
+      alongside IPv4. Previously, we checked both exit policies for only
+      router info structures, while microdescriptors were IPv4-only. Fixes
+      bug 27284; bugfix on 0.2.3.1-alpha. Patch by Neel Chauhan.
+
+  o Minor bugfixes (logging):
+    - Change log level of message "Hash of session info was not as expected"
+      to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix on 0.1.1.10-alpha.
+    - Fix a code issue that would have broken our parsing of log
+      domains as soon as we had 33 of them.  Fortunately, we still
+      only have 29.  Fixes bug 31451; bugfix on 0.4.1.4-rc.
+
+  o Minor bugfixes (memory management):
+    - Stop leaking a small amount of memory in nt_service_install(), in
+      unreachable code. Fixes bug 30799; bugfix on 0.2.0.7-alpha.
+      Patch by Xiaoyin Liu.
+
+  o Minor bugfixes (networking, IP addresses):
+    - When parsing addreses via Tor's internal DNS lookup API, reject IPv4
+      addresses in square brackets, and accept IPv6 addresses in square
+      brackets. This change completes the work started in 23082, making
+      address parsing consistent between tor's internal DNS lookup and address
+      parsing APIs. Fixes bug 30721; bugfix on 0.2.1.5-alpha.
+    - When parsing addreses via Tor's internal address:port parsing and
+      DNS lookup APIs, require IPv6 addresses with ports to have square
+      brackets. But allow IPv6 addresses without ports, whether or not they
+      have square brackets. Fixes bug 30721; bugfix on 0.2.1.5-alpha.
+
+  o Minor bugfixes (onion service v3):
+    - When purging the client descriptor cache, always also close any
+      introduction point circuits associated with it. This avoids picking those
+      when connecting to them later while not having the descriptor to complete
+      the introduction. Fixes bug 30921; bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (onion services):
+    - In the hs_ident_circuit_t data structure, remove the unused field
+      circuit_type and the respective argument in hs_ident_circuit_new().
+      This field is set by clients (for introduction) and services (for
+      introduction and rendezvous) but is never used afterwards. Fixes
+      bug 31490; bugfix on 0.3.2.1-alpha. Patch by Neel Chauhan.
+
+  o Minor bugfixes (operator tools):
+    - Make tor-print-ed-signing-cert(1) print certificate expiration date in
+      RFC 1123 and UNIX timestamp formats, to make output machine readable.
+      Fixes bug 31012; bugfix on 0.3.5.1-alpha.
+
+  o Minor bugfixes (practracker):
+    - When running check-best-practices, only consider files in the
+      src subdirectory.  Previously we had recursively considered
+      all subdirectories, which made us get confused by the
+      temporary directories made by "make distcheck".  Fixes bug
+      31578; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (rust):
+    - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463;
+      bugfix on 0.3.5.4-alpha.
+    - Raise the minimum rustc version to 1.31.0, as checked by configure
+      and CI. Fixes bug 31442; bugfix on 0.3.5.4-alpha.
+
+  o Minor bugfixes (sendme, code structure):
+    - Rename the trunnel SENDME file definition from sendme.trunnel to
+      sendme_cell.trunnel to avoid having twice sendme.{c|h} in the repository.
+      Fixes bug 30769; bugfix on 0.4.1.1-alpha.
+
+  o Minor bugfixes (statistics):
+    - Stop removing the ed25519 signature if the extra info file is too big.
+      If the signature data was removed, but the keyword was kept, this could
+      result in an unparseable extra info file. Fixes bug 30958;
+      bugfix on 0.2.7.2-alpha.
+
+  o Minor bugfixes (subsystems):
+    - Make the subsystem init order match the subsystem module dependencies.
+      Call windows process security APIs as early as possible. Init log before
+      network and time, so that network and time can use logging.
+      Fixes bug 31615; bugfix on 0.4.0.1-alpha.
+
+  o Minor bugfixes (testing):
+    - Teach the util/socketpair_ersatz test to work correctly when we
+      have no network stack configured. Fixes bug 30804; bugfix on
+      0.2.5.1-alpha.
+
+  o Minor bugfixes (v2 single onion services):
+    - Always retry v2 single onion service intro and rend circuits with a
+      3-hop path. Previously, v2 single onion services used a 3-hop path
+      when rend circuits were retried after a remote or delayed failure,
+      but a 1-hop path for immediate retries. Fixes bug 23818;
+      bugfix on 0.2.9.3-alpha.
+
+  o Minor bugfixes (v3 single onion services):
+    - Always retry v3 single onion service intro and rend circuits with a
+      3-hop path. Previously, v3 single onion services used a 3-hop path
+      when rend circuits were retried after a remote or delayed failure,
+      but a 1-hop path for immediate retries. Fixes bug 23818;
+      bugfix on 0.3.2.1-alpha.
+    - Make v3 single onion services fall back to a 3-hop intro, when there
+      all intro points are unreachable via a 1-hop path. Previously, v3
+      single onion services failed when all intro nodes were unreachable
+      via a 1-hop path. Fixes bug 23507; bugfix on 0.3.2.1-alpha.
+
+  o Code simplification and refactoring:
+    - Eliminate some uses of lower-level control reply abstractions,
+      primarily in the onion_helper functions. Closes ticket 30889.
+    - Extract our variable manipulation code from confparse.c to a new
+      lower-level typedvar.h module. Closes ticket 30864.
+    - Improve documentation in circuit padding subsystem. Patch by Tobias
+      Pulls. Closes ticket 31113.
+    - Lower another layer of object management from confparse.c to
+      a more general tool.  Now typed structure members are accessible
+      via an abstract type. Implements ticket 30914.
+    - Move our backend logic for working with configuration and state
+      files into a lower-level library, since in no longer depends on
+      any tor-specific functionality. Closes ticket 31626.
+    - Numerous simplifications in configuration-handling logic:
+      remove duplicated macro definitions, replace magical names
+      with flags, and refactor "TestingTorNetwork" to use the
+      same default-option logic as the rest of Tor.
+      Closes ticket 30935.
+    - Replace our ad-hoc set of flags for configuration variables and
+      configuration variable types with fine-grained orthogonal flags
+      corresponding to the actual behavior we want. Closes ticket 31625.
+    - Rework bootstrap tracking to use the new publish-subscribe
+      subsystem. Closes ticket 29976.
+    - Rewrite format_node_description() and router_get_verbose_nickname() to
+      use strlcpy() and strlcat(). The previous implementation used memcpy()
+      and pointer arithmetic, which was error-prone.
+      Closes ticket 31545. This is CID 1452819.
+    - Split extrainfo_dump_to_string() into smaller functions.
+      Closes ticket 30956.
+    - Use the ptrdiff_t type consistently for expressing variable offsets and
+      pointer differences.  Previously we incorrectly (but harmlessly) used
+      int and sometimes off_t for these cases.  Closes ticket 31532.
+    - Use the subsystems mechanism to manage the main event loop code.
+      Closes ticket 30806.
+    - Various simplifications and minor improvements to the circuit padding
+      machines. Patch by Tobias Pulls. Closes tickets 31112 and 31098.
+
+  o Documentation (hard-coded directories):
+    - Improve the documentation for the DirAuthority and FallbackDir torrc
+      options. Closes ticket 30955.
+
+  o Documentation (tor.1 man page):
+    - Fix typo -help to --help in tor.1 man page. Fixes bug 31008; bugfix on
+      0.2.2.9-alpha.
+
+  o Documentation:
+    - Include an example usage for IPv6 ORPort in our sample torrc.
+      Closes ticket 31320; patch from Ali Raheem.
+    - Use RFC 2397 data URL scheme to embed image into tor-exit-notice.html
+      so that operators would no longer have to host it themselves.
+      Closes ticket 31089.
+
+  o New system requirements (build system):
+    - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system.
+      Closes 31673;
+
+  o Removed features:
+    - Remove torctl.in from contrib/dist directory. Resolves ticket 30550.
+
+  o Testing:
+    - Run shellcheck for all non-third-party shell scripts that are shipped
+      with Tor. Closes ticket 29533.
+    - When checking shell scripts, ignore any user-created directories.
+      Closes ticket 30967.
+
+
 Changes in version 0.4.1.5 - 2019-08-20
   This is the first stable release in the 0.4.1.x series. This series
   adds experimental circuit-level padding, authenticated SENDME cells to
diff --git a/changes/bug12399 b/changes/bug12399
deleted file mode 100644
index 922c08c5e3..0000000000
--- a/changes/bug12399
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (logging):
-    - Change log level of message "Hash of session info was not as expected"
-      to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix on 0.1.1.10-alpha.
diff --git a/changes/bug23507 b/changes/bug23507
deleted file mode 100644
index de18273fdb..0000000000
--- a/changes/bug23507
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (v3 single onion services):
-    - Make v3 single onion services fall back to a 3-hop intro, when there
-      all intro points are unreachable via a 1-hop path. Previously, v3
-      single onion services failed when all intro nodes were unreachable
-      via a 1-hop path. Fixes bug 23507; bugfix on 0.3.2.1-alpha.
diff --git a/changes/bug23818_v2 b/changes/bug23818_v2
deleted file mode 100644
index 0219a20f49..0000000000
--- a/changes/bug23818_v2
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (v2 single onion services):
-    - Always retry v2 single onion service intro and rend circuits with a
-      3-hop path. Previously, v2 single onion services used a 3-hop path
-      when rend circuits were retried after a remote or delayed failure,
-      but a 1-hop path for immediate retries. Fixes bug 23818;
-      bugfix on 0.2.9.3-alpha.
diff --git a/changes/bug23818_v3 b/changes/bug23818_v3
deleted file mode 100644
index c430144d81..0000000000
--- a/changes/bug23818_v3
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (v3 single onion services):
-    - Always retry v3 single onion service intro and rend circuits with a
-      3-hop path. Previously, v3 single onion services used a 3-hop path
-      when rend circuits were retried after a remote or delayed failure,
-      but a 1-hop path for immediate retries. Fixes bug 23818;
-      bugfix on 0.3.2.1-alpha.
diff --git a/changes/bug27284 b/changes/bug27284
deleted file mode 100644
index 14fc2082fe..0000000000
--- a/changes/bug27284
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (ipv6):
-    - When parsing microdescriptors, we should check the IPv6 exit policy
-      alongside IPv4. Previously, we checked both exit policies for only
-      router info structures, while microdescriptors were IPv4-only. Fixes
-      bug 27284; bugfix on 0.2.3.1-alpha. Patch by Neel Chauhan.
diff --git a/changes/bug30455 b/changes/bug30455
deleted file mode 100644
index aecbde5a33..0000000000
--- a/changes/bug30455
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (chutney, makefiles, documentation):
-    - "make test-network-all" shows the warnings from each test-network.sh
-      run on the console, so developers see new warnings early. Improve the
-      documentation for this feature, and rename a Makefile variable so the
-      code is self-documenting. Fixes bug 30455; bugfix on 0.3.0.4-rc.
diff --git a/changes/bug30721 b/changes/bug30721
deleted file mode 100644
index 5ea4a14625..0000000000
--- a/changes/bug30721
+++ /dev/null
@@ -1,10 +0,0 @@
-  o Minor bugfixes (networking, IP addresses):
-    - When parsing addreses via Tor's internal DNS lookup API, reject IPv4
-      addresses in square brackets, and accept IPv6 addresses in square
-      brackets. This change completes the work started in 23082, making
-      address parsing consistent between tor's internal DNS lookup and address
-      parsing APIs. Fixes bug 30721; bugfix on 0.2.1.5-alpha.
-    - When parsing addreses via Tor's internal address:port parsing and
-      DNS lookup APIs, require IPv6 addresses with ports to have square
-      brackets. But allow IPv6 addresses without ports, whether or not they
-      have square brackets. Fixes bug 30721; bugfix on 0.2.1.5-alpha.
diff --git a/changes/bug30780 b/changes/bug30780
deleted file mode 100644
index 5731d201a2..0000000000
--- a/changes/bug30780
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (directory authorities):
-    - Return a distinct status when formatting annotations fails.
-      Fixes bug 30780; bugfix on 0.2.0.8-alpha.
diff --git a/changes/bug30799 b/changes/bug30799
deleted file mode 100644
index b10420a953..0000000000
--- a/changes/bug30799
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (memory management):
-    - Stop leaking a small amount of memory in nt_service_install(), in
-      unreachable code. Fixes bug 30799; bugfix on 0.2.0.7-alpha.
-      Patch by Xiaoyin Liu.
diff --git a/changes/bug30804 b/changes/bug30804
deleted file mode 100644
index ba4a3e8b8c..0000000000
--- a/changes/bug30804
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (testing):
-    - Teach the util/socketpair_ersatz test to work correctly when we
-      have no network stack configured. Fixes bug 30804; bugfix on
-      0.2.5.1-alpha.
diff --git a/changes/bug30840 b/changes/bug30840
deleted file mode 100644
index 562b0fbd93..0000000000
--- a/changes/bug30840
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (git scripts):
-    - Stop hard-coding the bash path in the git scripts. Some OSes don't
-      have bash in /usr/bin, others have an ancient bash at this path.
-      Fixes bug 30840; bugfix on 0.4.0.1-alpha.
diff --git a/changes/bug30841 b/changes/bug30841
deleted file mode 100644
index c6d1c51469..0000000000
--- a/changes/bug30841
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (git scripts):
-    - Stop hard-coding the tor master branch name and worktree path in the
-      git scripts. Fixes bug 30841; bugfix on 0.4.0.1-alpha.
diff --git a/changes/bug30958 b/changes/bug30958
deleted file mode 100644
index 374c8e46f7..0000000000
--- a/changes/bug30958
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (statistics):
-    - Stop removing the ed25519 signature if the extra info file is too big.
-      If the signature data was removed, but the keyword was kept, this could
-      result in an unparseable extra info file. Fixes bug 30958;
-      bugfix on 0.2.7.2-alpha.
diff --git a/changes/bug31040 b/changes/bug31040
deleted file mode 100644
index 81f6d7e795..0000000000
--- a/changes/bug31040
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (developer tooling):
-    - Only log git script changes in post-merge script when merge was to the
-      master branch. Fixes bug 31040; bugfix on 0.4.1.1-alpha.
diff --git a/changes/bug31088 b/changes/bug31088
deleted file mode 100644
index c258d1bada..0000000000
--- a/changes/bug31088
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (ipv6):
-    - We check for private IPv6 address alongside their IPv4 equivalents when
-      authorities check descriptors. Previously, we only checked for private
-      IPv4 addresses. Fixes bug 31088; bugfix on 0.2.3.21-rc. Patch by Neel
-      Chauhan.
diff --git a/changes/bug31112 b/changes/bug31112
deleted file mode 100644
index 882efaad59..0000000000
--- a/changes/bug31112
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Various simplifications and minor improvements to the circuit padding
-      machines. Patch by Tobias Pulls. Closes tickets 31112 and 31098.
diff --git a/changes/bug31113 b/changes/bug31113
deleted file mode 100644
index f48328f0fe..0000000000
--- a/changes/bug31113
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Improve documentation in circuit padding subsystem. Patch by Tobias
-      Pulls. Closes ticket 31113.
diff --git a/changes/bug31442 b/changes/bug31442
deleted file mode 100644
index 4df9fc6dfb..0000000000
--- a/changes/bug31442
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (rust):
-    - Raise the minimum rustc version to 1.31.0, as checked by configure
-      and CI. Fixes bug 31442; bugfix on 0.3.5.4-alpha.
diff --git a/changes/bug31462 b/changes/bug31462
deleted file mode 100644
index 54ab990bb8..0000000000
--- a/changes/bug31462
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (git hooks):
-    - Remove a duplicate call to practracker from the pre-push hook.
-      The pre-push hook already calls the pre-commit hook, which calls
-      practracker. Fixes bug 31462; bugfix on 0.4.1.1-alpha.
diff --git a/changes/bug31463 b/changes/bug31463
deleted file mode 100644
index d85c0887c3..0000000000
--- a/changes/bug31463
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (rust):
-    - Correctly exclude a redundant rust build job in Travis. Fixes bug 31463;
-      bugfix on 0.3.5.4-alpha.
diff --git a/changes/bug31490 b/changes/bug31490
deleted file mode 100644
index 24782be3ec..0000000000
--- a/changes/bug31490
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (onion services):
-    - In the hs_ident_circuit_t data structure, remove the unused field
-      circuit_type and the respective argument in hs_ident_circuit_new().
-      This field is set by clients (for introduction) and services (for
-      introduction and rendezvous) but is never used afterwards. Fixes
-      bug 31490; bugfix on 0.3.2.1-alpha. Patch by Neel Chauhan.
diff --git a/changes/bug31552 b/changes/bug31552
deleted file mode 100644
index fb33e14429..0000000000
--- a/changes/bug31552
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (compilation):
-    - Add more stub functions to fix compilation on Android with LTO, when
-      --disable-module-dirauth is used. Previously, these compilation
-      settings would make the compiler look for functions that didn't exist.
-      Fixes bug 31552; bugfix on 0.4.1.1-alpha.
diff --git a/changes/bug31570 b/changes/bug31570
deleted file mode 100644
index f70b577b4c..0000000000
--- a/changes/bug31570
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (crash, android):
-    - Tolerate systems (including some Android installations) where madvise
-      and MADV_DONTDUMP are available at build-time, but not at run time.
-      Previously, these systems would notice a failed syscall and abort.
-      Fixes bug 31570; bugfix on 0.4.1.1-alpha.
diff --git a/changes/bug31571 b/changes/bug31571
deleted file mode 100644
index 86de3537ba..0000000000
--- a/changes/bug31571
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor bugfixes (error handling):
-    - Report the tor version whenever an assertion fails. Previously, we only
-      reported the Tor version on some crashes, and some non-fatal assertions.
-      Fixes bug 31571; bugfix on 0.3.5.1-alpha.
-    - On abort, try harder to flush the output buffers of log messages. On
-      some platforms (macOS), log messages can be discarded when the process
-      terminates. Fixes bug 31571; bugfix on 0.3.5.1-alpha.
diff --git a/changes/bug31594 b/changes/bug31594
deleted file mode 100644
index 75e6ec33cc..0000000000
--- a/changes/bug31594
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (error handling):
-    - When tor aborts due to an error, close log file descriptors before
-      aborting. Closing the logs makes some OSes flush log file buffers,
-      rather than deleting buffered log lines. Fixes bug 31594;
-      bugfix on 0.2.5.2-alpha.
diff --git a/changes/bug31615 b/changes/bug31615
deleted file mode 100644
index 49b13bea95..0000000000
--- a/changes/bug31615
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (subsystems):
-    - Make the subsystem init order match the subsystem module dependencies.
-      Call windows process security APIs as early as possible. Init log before
-      network and time, so that network and time can use logging.
-      Fixes bug 31615; bugfix on 0.4.0.1-alpha.
diff --git a/changes/bug31657 b/changes/bug31657
deleted file mode 100644
index 08e9d95fdf..0000000000
--- a/changes/bug31657
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (guards):
-    - When tor is missing descriptors for some primary entry guards, make the
-      log message less alarming. It's normal for descriptors to expire, as long
-      as tor fetches new ones soon after. Fixes bug 31657;
-      bugfix on 0.3.3.1-alpha.
diff --git a/changes/bug31696 b/changes/bug31696
deleted file mode 100644
index b9d6c4130c..0000000000
--- a/changes/bug31696
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major bugfixes (crash, Linux):
-    - Tolerate systems (including some Linux installations) where madvise
-      and/or MADV_DONTFORK are available at build-time, but not at run time.
-      Previously, these systems would notice a failed syscall and abort.
-      Fixes bug 31696; bugfix on 0.4.1.1-alpha.
diff --git a/changes/doc31089 b/changes/doc31089
deleted file mode 100644
index 2fc0ba4f7d..0000000000
--- a/changes/doc31089
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Documentation:
-    - Use RFC 2397 data URL scheme to embed image into tor-exit-notice.html
-      so that operators would no longer have to host it themselves.
-      Closes ticket 31089.
diff --git a/changes/ticket19381 b/changes/ticket19381
deleted file mode 100644
index ee51e2a3e2..0000000000
--- a/changes/ticket19381
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (build system):
-    - Add --disable-manpage and --disable-html-manual options to configure
-      script. This will enable shortening build times by not building
-      documentation. Resolves issue 19381.
diff --git a/changes/ticket21003 b/changes/ticket21003
deleted file mode 100644
index 896d7493eb..0000000000
--- a/changes/ticket21003
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (IPv6, logging):
-    - Log IPv6 addresses as well as IPv4 addresses, when describing
-      routerinfos, routerstatuses, and nodes. Closes ticket 21003.
diff --git a/changes/ticket24963 b/changes/ticket24963
deleted file mode 100644
index 50adcfaaf4..0000000000
--- a/changes/ticket24963
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor feature (onion service):
-    - Disallow single hop clients to introduce directly at the introduction
-      point. We've removed Tor2web a while back and rendezvous are blocked at
-      the relays. This is to remove load off the network from spammy clients.
-      Close ticket 24963.
diff --git a/changes/ticket24964 b/changes/ticket24964
deleted file mode 100644
index 171c86eb1d..0000000000
--- a/changes/ticket24964
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor feature (onion service v3):
-    - Do not allow single hop client to fetch or post an HS descriptor from an
-      HSDir. Closes ticket 24964;
-
diff --git a/changes/ticket27530 b/changes/ticket27530
deleted file mode 100644
index 8ae4f52668..0000000000
--- a/changes/ticket27530
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (compilation):
-    - Log a more useful error message when we are compiling and one of the
-      compile-time hardening options we have selected can be linked but
-      not executed. Closes ticket 27530.
diff --git a/changes/ticket29533 b/changes/ticket29533
deleted file mode 100644
index 27ef681218..0000000000
--- a/changes/ticket29533
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Testing:
-    - Run shellcheck for all non-third-party shell scripts that are shipped
-      with Tor. Closes ticket 29533.
diff --git a/changes/ticket29738 b/changes/ticket29738
deleted file mode 100644
index 9217cc9a5f..0000000000
--- a/changes/ticket29738
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features (recommended packages):
-    - No longer include recommended packages in votes as detailed in proposal
-      301. The RecommendedPackages torrc option is deprecated and will no
-      longer have any effect. "package" lines will still be considered when
-      computing consensuses for consensus methods that include them. Fixes
-      ticket 29738.
diff --git a/changes/ticket29746 b/changes/ticket29746
deleted file mode 100644
index 63b9edb391..0000000000
--- a/changes/ticket29746
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (best practices tracker):
-    - Fix a few issues in the best-practices script, including tests, tab
-      tolerance, error reporting, and directory-exclusion logic. Fixes bug
-      29746; bugfix on 0.4.1.1-alpha.
diff --git a/changes/ticket29879 b/changes/ticket29879
deleted file mode 100644
index c37bdd3f62..0000000000
--- a/changes/ticket29879
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor features (git scripts):
-    - Add a TOR_PUSH_DELAY variable to git-push-all.sh, which makes the script
-      push master and maint branches with a delay between each branch. These
-      delays trigger the CI jobs in a set order, which should show the most
-      likely failures first. Also make pushes atomic by default, and make
-      the script pass any command-line arguments to git push.
-      Closes ticket 29879.
diff --git a/changes/ticket29976 b/changes/ticket29976
deleted file mode 100644
index 9991bfb1ff..0000000000
--- a/changes/ticket29976
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Rework bootstrap tracking to use the new publish-subscribe
-      subsystem. Closes ticket 29976.
diff --git a/changes/ticket30102 b/changes/ticket30102
deleted file mode 100644
index c8b1148da3..0000000000
--- a/changes/ticket30102
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (continuous integration):
-    - When running CI builds on Travis, put some random data in ~/.torrc,
-      to make sure no tests are dependent on default Tor configuration.
-      Resolves issue 30102.
diff --git a/changes/ticket30550 b/changes/ticket30550
deleted file mode 100644
index f356c4048e..0000000000
--- a/changes/ticket30550
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Removed features:
-    - Remove torctl.in from contrib/dist directory. Resolves ticket 30550.
diff --git a/changes/ticket30687 b/changes/ticket30687
deleted file mode 100644
index c3124eb64b..0000000000
--- a/changes/ticket30687
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor feature (token bucket):
-    - Implement a generic token bucket that uses a single counter. This will be
-      useful for the anti-DoS onion service work. Closes ticket 30687.
diff --git a/changes/ticket30752 b/changes/ticket30752
deleted file mode 100644
index 044c7c7d93..0000000000
--- a/changes/ticket30752
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features (best practices tracker):
-    - Give a warning rather than an error when a practracker exception is
-      violated by a small amount; add a --list-overbroad option to
-      practracker that lists exceptions that are stricter than they need to
-      be, and provide an environment variable for disabling
-      practracker. Closes ticekt 30752.
diff --git a/changes/ticket30769 b/changes/ticket30769
deleted file mode 100644
index 74f63a1465..0000000000
--- a/changes/ticket30769
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (sendme, code structure):
-    - Rename the trunnel SENDME file definition from sendme.trunnel to
-      sendme_cell.trunnel to avoid having twice sendme.{c|h} in the repository.
-      Fixes bug 30769; bugfix on 0.4.1.1-alpha.
diff --git a/changes/ticket30806 b/changes/ticket30806
deleted file mode 100644
index 4f09ea2af3..0000000000
--- a/changes/ticket30806
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Use the subsystems mechanism to manage the main event loop code.
-      Closes ticket 30806.
diff --git a/changes/ticket30864 b/changes/ticket30864
deleted file mode 100644
index b8fb571300..0000000000
--- a/changes/ticket30864
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Extract our variable manipulation code from confparse.c to a new
-      lower-level typedvar.h module. Closes ticket 30864.
diff --git a/changes/ticket30871 b/changes/ticket30871
deleted file mode 100644
index 81c076bb02..0000000000
--- a/changes/ticket30871
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major bugfixes (circuit build, guard):
-    - When considering upgrading circuits from "waiting for guard" to "open",
-      always ignore the ones that are mark for close. Else, we can end up in
-      the situation where a subsystem is notified of that circuit opening but
-      still marked for close leading to undesirable behavior. Fixes bug 30871;
-      bugfix on 0.3.0.1-alpha.
diff --git a/changes/ticket30889 b/changes/ticket30889
deleted file mode 100644
index 8582e2bcac..0000000000
--- a/changes/ticket30889
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Eliminate some uses of lower-level control reply abstractions,
-      primarily in the onion_helper functions. Closes ticket 30889.
diff --git a/changes/ticket30893 b/changes/ticket30893
deleted file mode 100644
index 638b99a9f7..0000000000
--- a/changes/ticket30893
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (testing):
-    - Improve test coverage for our existing configuration parsing and
-      management API. Closes ticket 30893.
diff --git a/changes/ticket30914 b/changes/ticket30914
deleted file mode 100644
index c8c008b3d1..0000000000
--- a/changes/ticket30914
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplification and refactoring:
-    - Lower another layer of object management from confparse.c to
-      a more general tool.  Now typed structure members are accessible
-      via an abstract type. Implements ticket 30914.
diff --git a/changes/ticket30921 b/changes/ticket30921
deleted file mode 100644
index 50ec570ffe..0000000000
--- a/changes/ticket30921
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (onion service v3):
-    - When purging the client descriptor cache, always also close any
-      introduction point circuits associated with it. This avoids picking those
-      when connecting to them later while not having the descriptor to complete
-      the introduction. Fixes bug 30921; bugfix on 0.3.2.1-alpha.
diff --git a/changes/ticket30924 b/changes/ticket30924
deleted file mode 100644
index 832c377972..0000000000
--- a/changes/ticket30924
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major features (onion service v3, denial of service):
-    - Add onion service introduction denial of service defenses. They consist of
-      rate limiting client introduction at the intro point using parameters that
-      can be sent by the service within the ESTABLISH_INTRO cell. If the cell
-      extension for this is not used, the intro point will honor the consensus
-      parameters. Closes ticket 30924.
diff --git a/changes/ticket30935 b/changes/ticket30935
deleted file mode 100644
index 5a7e918895..0000000000
--- a/changes/ticket30935
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Code simplification and refactoring:
-    - Numerous simplifications in configuration-handling logic:
-      remove duplicated macro definitions, replace magical names
-      with flags, and refactor "TestingTorNetwork" to use the
-      same default-option logic as the rest of Tor.
-      Closes ticket 30935.
diff --git a/changes/ticket30955 b/changes/ticket30955
deleted file mode 100644
index 7715a07569..0000000000
--- a/changes/ticket30955
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation (hard-coded directories):
-    - Improve the documentation for the DirAuthority and FallbackDir torrc
-      options. Closes ticket 30955.
diff --git a/changes/ticket30956_refactor b/changes/ticket30956_refactor
deleted file mode 100644
index 81151c6cc9..0000000000
--- a/changes/ticket30956_refactor
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Split extrainfo_dump_to_string() into smaller functions.
-      Closes ticket 30956.
diff --git a/changes/ticket30967 b/changes/ticket30967
deleted file mode 100644
index 5fe9c980b6..0000000000
--- a/changes/ticket30967
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Testing:
-    - When checking shell scripts, ignore any user-created directories.
-      Closes ticket 30967.
-  o Minor features (git scripts):
-    - Call the shellcheck script from the pre-commit hook.
-      Closes ticket 30967.
diff --git a/changes/ticket30979 b/changes/ticket30979
deleted file mode 100644
index ffe1bfb4ab..0000000000
--- a/changes/ticket30979
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Minor features (git hooks):
-    - Our pre-commit git hook now checks for a special file
-      before running practracker, so that practracker only runs on branches
-      that are based on master. Since the pre-push hook calls the pre-commit
-      hook, practracker will also only run before pushes of branches based
-      on master.
-      Closes ticket 30979.
diff --git a/changes/ticket31008 b/changes/ticket31008
deleted file mode 100644
index c7077de6c6..0000000000
--- a/changes/ticket31008
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation (tor.1 man page):
-    - Fix typo -help to --help in tor.1 man page. Fixes bug 31008; bugfix on
-      0.2.2.9-alpha.
diff --git a/changes/ticket31012 b/changes/ticket31012
deleted file mode 100644
index 61ea30d8da..0000000000
--- a/changes/ticket31012
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (operator tools):
-    - Make tor-print-ed-signing-cert(1) print certificate expiration date in
-      RFC 1123 and UNIX timestamp formats, to make output machine readable.
-      Fixes bug 31012; bugfix on 0.3.5.1-alpha.
diff --git a/changes/ticket31025 b/changes/ticket31025
deleted file mode 100644
index c572288239..0000000000
--- a/changes/ticket31025
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (coverity):
-    - In our siphash implementation, when building for coverity, use memcpy
-      in place of a switch statement, so that coverity can tell we are not
-      accessing out-of-bounds memory. Fixes bug 31025; bugfix on
-      0.2.8.1-alpha.  This is tracked as CID 1447293 and 1447295.
diff --git a/changes/ticket31026 b/changes/ticket31026
deleted file mode 100644
index 6f6abcffba..0000000000
--- a/changes/ticket31026
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (coverity compliance):
-    - Add an assertion when parsing a BEGIN cell so that coverity can be sure
-      that we are not about to dereference a NULL address.
-      Fixes bug 31026; bugfix on 0.2.4.7-alpha.  This is CID
-      1447296.
diff --git a/changes/ticket31030 b/changes/ticket31030
deleted file mode 100644
index 4d99323b4e..0000000000
--- a/changes/ticket31030
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (coverity, tests):
-    - Fix several coverity warnings from our unit tests. Fixes bug 31030;
-      bugfix on 0.2.4.1-alpha, 0.3.2.1-alpha, and 0.4.0.1-alpha.
diff --git a/changes/ticket31175 b/changes/ticket31175
deleted file mode 100644
index cff13761a4..0000000000
--- a/changes/ticket31175
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (development tools):
-    - Our best-practices tracker now looks at headers as well as
-      C files. Closes ticket 31175.
diff --git a/changes/ticket31176 b/changes/ticket31176
deleted file mode 100644
index 5fcdeab3af..0000000000
--- a/changes/ticket31176
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Major features (developer tools):
-    - Our best-practices tracker now integrates with our include-checker tool
-      to keep track of the layering violations that we have not yet fixed.
-      We hope to reduce this number over time to improve Tor's modularity.
-      Closes ticket 31176.
diff --git a/changes/ticket31240 b/changes/ticket31240
deleted file mode 100644
index 0fe37ff44b..0000000000
--- a/changes/ticket31240
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (configuration):
-    - The configuration code has been extended to allow splitting
-      configuration data across multiple objects. Previously, all
-      configuration data needed to be kept in a single object, which
-      tended to become bloated.  Closes ticket 31240.
diff --git a/changes/ticket31304 b/changes/ticket31304
deleted file mode 100644
index ca60148b0c..0000000000
--- a/changes/ticket31304
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (tests):
-    - The practracker tests are now run as part of the Tor test suite.
-      Closes ticket 31304.
diff --git a/changes/ticket31309 b/changes/ticket31309
deleted file mode 100644
index 8e1c9f27ea..0000000000
--- a/changes/ticket31309
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (best practices tracker):
-    - Add a TOR_PRACTRACKER_OPTIONS variable for passing arguments
-      to practracker from the environment. We may want this for
-      continuous integration. Closes ticket 31309.
diff --git a/changes/ticket31314 b/changes/ticket31314
deleted file mode 100644
index 7ce96e96cf..0000000000
--- a/changes/ticket31314
+++ /dev/null
@@ -1,18 +0,0 @@
-  o Minor features (git scripts):
-    - Add a -t <test-branch-prefix> argument to git-merge-forward.sh and
-      git-push-all.sh, which makes these scripts create, merge forward, and
-      push test branches. Closes ticket 31314.
-    - Add a -r <remote-name> argument to git-push-all.sh, so the script can
-      push test branches to a personal remote. Closes ticket 31314.
-    - Add a -u argument to git-merge-forward.sh, so that the script can re-use
-      existing test branches after a merge failure and fix.
-      Closes ticket 31314.
-    - Add a TOR_GIT_PUSH env var, which sets the default git push command and
-      arguments for git-push-all.sh. Closes ticket 31314.
-    - Add a "--" command-line argument, to
-      separate git-push-all.sh script arguments from arguments that are passed
-      through to git push. Closes ticket 31314.
-    - Skip pushing test branches that are the same as a remote
-      maint/release/master branch in git-push-all.sh by default. Add a -s
-      argument, so git-push-all.sh can push all test branches.
-      Closes ticket 31314.
diff --git a/changes/ticket31320 b/changes/ticket31320
deleted file mode 100644
index 07847e5624..0000000000
--- a/changes/ticket31320
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    - Include an example usage for IPv6 ORPort in our sample torrc.
-      Closes ticket 31320; patch from Ali Raheem.
diff --git a/changes/ticket31451 b/changes/ticket31451
deleted file mode 100644
index 773d665957..0000000000
--- a/changes/ticket31451
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (logging):
-    - Fix a code issue that would have broken our parsing of log
-      domains as soon as we had 33 of them.  Fortunately, we still
-      only have 29.  Fixes bug 31451; bugfix on 0.4.1.4-rc.
diff --git a/changes/ticket31475 b/changes/ticket31475
deleted file mode 100644
index e156c145a9..0000000000
--- a/changes/ticket31475
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (configuration):
-    - Invalid floating-point values in the configuration file are now
-      detected treated as errors in the configuration. Previously, they
-      were ignored and treated as zero. Fixes bug 31475; bugfix on
-      0.0.1.
diff --git a/changes/ticket31477 b/changes/ticket31477
deleted file mode 100644
index 5a0fdd1544..0000000000
--- a/changes/ticket31477
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (tests):
-    - Add integration tests to make sure that practracker gives the outputs
-      we expect. Closes ticket 31477.
diff --git a/changes/ticket31529 b/changes/ticket31529
deleted file mode 100644
index 84f982214c..0000000000
--- a/changes/ticket31529
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (debugging):
-    - Log a nonfatal assertion failure if we encounter a configuration
-      line whose command is "CLEAR" but which has a nonempty value.
-      This should be impossible, according to the rules of our
-      configuration line parsing. Closes ticket 31529.
diff --git a/changes/ticket31532 b/changes/ticket31532
deleted file mode 100644
index 95bcbc517c..0000000000
--- a/changes/ticket31532
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplification and refactoring:
-    - Use the ptrdiff_t type consistently for expressing variable offsets and
-      pointer differences.  Previously we incorrectly (but harmlessly) used
-      int and sometimes off_t for these cases.  Closes ticket 31532.
diff --git a/changes/ticket31545 b/changes/ticket31545
deleted file mode 100644
index 58921c2ad8..0000000000
--- a/changes/ticket31545
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Code simplification and refactoring:
-    - Rewrite format_node_description() and router_get_verbose_nickname() to
-      use strlcpy() and strlcat(). The previous implementation used memcpy()
-      and pointer arithmetic, which was error-prone.
-      Closes ticket 31545. This is CID 1452819.
diff --git a/changes/ticket31554 b/changes/ticket31554
deleted file mode 100644
index 73f4159ff3..0000000000
--- a/changes/ticket31554
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (stem tests):
-    - Change "make test-stem" so it only runs the stem tests that use tor.
-      This change makes test-stem faster and more reliable.
-      Closes ticket 31554.
diff --git a/changes/ticket31578 b/changes/ticket31578
deleted file mode 100644
index 220efffa63..0000000000
--- a/changes/ticket31578
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (practracker):
-    - When running check-best-practices, only consider files in the
-      src subdirectory.  Previously we had recursively considered
-      all subdirectories, which made us get confused by the
-      temporary directories made by "make distcheck".  Fixes bug
-      31578; bugfix on 0.4.1.1-alpha.
diff --git a/changes/ticket31625 b/changes/ticket31625
deleted file mode 100644
index 822a921e4f..0000000000
--- a/changes/ticket31625
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplification and refactoring:
-    - Replace our ad-hoc set of flags for configuration variables and
-      configuration variable types with fine-grained orthogonal flags
-      corresponding to the actual behavior we want. Closes ticket 31625.
diff --git a/changes/ticket31626 b/changes/ticket31626
deleted file mode 100644
index 443bc1eb87..0000000000
--- a/changes/ticket31626
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplification and refactoring:
-    - Move our backend logic for working with configuration and state
-      files into a lower-level library, since in no longer depends on
-      any tor-specific functionality. Closes ticket 31626.
diff --git a/changes/ticket31637 b/changes/ticket31637
deleted file mode 100644
index b6ffa8b892..0000000000
--- a/changes/ticket31637
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features (testing):
-    - Add a script to invoke "tor --dump-config" and "tor --verify-config"
-      with various configuration options, and see whether tor's resulting
-      configuration or error messages are what we expect. Use it for
-      integration testing of our +Option and /Option flags.
-      Closes ticket 31637.
diff --git a/changes/ticket31673 b/changes/ticket31673
deleted file mode 100644
index 3b2bb4a46e..0000000000
--- a/changes/ticket31673
+++ /dev/null
@@ -1,3 +0,0 @@
-  o New system requirements (build system):
-    - Do not include the deprecated <sys/sysctl.h> on Linux or Windows system.
-      Closes 31673;