diff --git a/ChangeLog b/ChangeLog
index 80f7785a8..6342995c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,249 @@
+Changes in version 0.2.7.3-????? - 2015-09-1?
+  XXXX write a blurb
+
+  o Major features (security, hidden services):
+    - For an hidden service, it is now prohibited to use one single
+      EntryNodes to avoid a very easy guard discovery attack. For more
+      details, see the ticket description here:
+      https://trac.torproject.org/projects/tor/ticket/14917. Fixes
+      ticket 14917.
+
+  o Major features (relay, Ed25519):
+    - Significant improvements to the usability of relay-side Ed25519
+      key management. Log messages are better, and the code can recover
+      from far more failure conditions. Thanks to "s7r" for reporting
+      and diagnosing so many of these!
+
+  o Major bugfixes (relay, Ed25519):
+    - Avoid crashing on 'tor --keygen'. Fixes bug 16679; bugfix on
+      0.2.7.2-alpha. Reported by "s7r".
+    - Improve handling of expired signing keys along with offline master
+      keys. Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported by "s7r".
+
+  o Major enhancements (performance testing):
+    - Add chutney performance testing support to src/test/test-
+      network.sh The following arguments change how chutney verifies the
+      network: "--bytes n" sends n bytes per test connection;
+      "--connections n" makes n test connections per client; and
+      "--hs-multi-client 1" makes each client connect to each HS.
+      Requires the corresponding chutney performance testing changes.
+      Note: using --connections 7 or greater on a HS will trigger issue
+      15937. Patch by "teor". Closes ticket 14175.
+
+  o Minor features:
+    - Try harder to normalize the exit status of the Tor process to the
+      standard-provided range. Fixes bug 16975; bugfix on every version
+      of Tor ever.
+    - Update geoip and geoip6 to the July 8 2015 Maxmind GeoLite2
+      Country database.
+
+  o Minor features (client-side privacy):
+    - Indefinitely extend circuit lifespan by resetting dirtyness, if
+      IsolateSOCKSAuth is in use, the new `KeepAliveIsolateSOCKSAuth`
+      option is set, and streams with SOCKS authentication are attached
+      to the circuit. Implements feature 15482.
+
+  o Minor features (compilation):
+    - Give a warning as early as possible when trying to build with an
+      unsupported OpenSSL version. Closes ticket 16901.
+
+  o Minor features (Hidden service directory):
+    - Relays need to have the Fast flag to get the HSDir flag. As this
+      is being written, we'll go from 2745 HSDirs down to 2342, a ~14%
+      drop. Fixes ticket 15963.
+
+  o Minor features (hidden Service Statistics):
+    - Turn on hidden service statistics collection by setting the torrc
+      option HiddenServiceStatistics to "1" by default. Closes
+      ticket 15254.
+
+  o Minor features (hidden service):
+    - Client now uses an introduction point failure cache to know when
+      to fetch or keep a descriptor in their cache.
+
+      When fetching a descriptor, for every introduction points in it,
+      we look them up in the failure cache to know if we keep the
+      descriptor or not. For this to work, everytime an introduction
+      points is discarded (ex: receiving a NACK), we note it down in our
+      introduction cache. If all introduction points for an onion
+      service are in our failure cache, we discard the descriptor and
+      fetch a new one.
+
+      See rendcache.c for a detailed explanation of the cache's
+      behavior. Closes ticket 16389.
+
+  o Minor features (performance):
+    - Improve the runtime speed of Ed25519 operations and Curve25519
+      keypair generation when built targeting 32 bit x86 platforms with
+      SSE2 available. Implements ticket 16535.
+    - Improve the runtime speed of Ed25519 signature verification by
+      using Ed25519-donna's batch verification support when there are a
+      lot of signatures to verify at once. Implements ticket 16533.
+
+  o Minor features (testing):
+    - Autodetect CHUTNEY_PATH if the chutney and tor sources are side-
+      by-side in the same parent directory. Closes ticket 16903. Patch
+      by "teor".
+
+  o Minor features (testing, authorities):
+    - New TestingDirAuthVote{Exit,Guard,HSDir}IsStrict flags. "A node
+      will never receive the corresponding flag unless that node is
+      specified in the TestingDirAuthVote{Exit,Guard,HSDir} list,
+      regardless of its uptime, bandwidth, exit policy, or DirPort".
+      Closes ticket 14882. Patch by "robgjansen", modified by "teor" as
+      VoteOnHidServDirectoriesV2 is now obsolete. Commit message and
+      changes file by "teor" & "robgjansen".
+
+  o Minor features (testing, authorities, documentation):
+    - Fix an error in the manual page and comments for
+      TestingDirAuthVoteHSDir[IsStrict], which suggested that a HSDir
+      required "ORPort connectivity". While this is true, it is in no
+      way unique to the HSDir flag. Of all the flags, only HSDirs need a
+      DirPort configured in order for the authorities to assign that
+      particular flag. Fixed as part of 14882. Patch by "teor". Bugfix
+      on 0.2.6.3 (f9d57473e1ff on 10 January 2015).
+
+  o Minor features (testing, bridges, hidden services):
+    - Make "bridges+hs" the default test network. This tests almost all
+      tor functionality during make test-network, while allowing tests
+      to succeed on non-IPv6 systems. Requires chutney commit 396da92 in
+      test-network-bridges-hs. Closes tickets 16945 (tor), 16946
+      (chutney) . Patches by "teor".
+
+  o Minor bugfixes:
+    - Check correctly for windows socket errors in the workqueue
+      backend. Fixes bug 16741; bugfix on 0.2.6.3-alpha.
+    - Ensure that worker threads actually exit when a fatal error or
+      shutdown is indicated. This doesn't currently affect the behaviour
+      of Tor, because Tor never indicates fatal error or shutdown except
+      in its unit tests. Fixes bug 16868; bugfix on 0.2.6.3-alpha.
+    - Fix an usage message of tor-resolve(1) so that it no longer lists
+      the removed -F option. Fixes bug 16913; bugfix on
+      Tor 0.2.2.28-beta.
+    - Fix the behavior of crypto_time_t when told to consider times
+      before 1970. (These times were possible when running in a
+      simulated network environment where time()'s output starts at
+      zero.) Fixes bug 16980; bugfix on 0.2.7.1-alpha.
+    - When calling channel_free_list(), avoid calling smartlist_remove()
+      while inside a FOREACH loop. This partially reverts commit
+      17356fe7fd96af where the correct SMARTLIST_DEL_CURRENT was
+      removed. Fixes bug 16924; bugfix on 0.2.4.4-alpha.
+    - When logging malformed hostnames in socks5 requests, respect
+      SafeLogging configuration. Fixes bug 16891; bugfix on 0.1.1.16-rc.
+    - include the TUNING document in our source tarball. It is referred
+      to in the ChangeLog and an error message. Fixes bug 16929; bugfix
+      on 0.2.6.1-alpha.
+
+  o Minor bugfix (open file limit):
+    - Fix set_max_file_descriptors() to set by default the max open file
+      limit to the current limit in case setrlimit() fails so we at
+      least have a usable value; Fixes bug 16274; bugfix on tor-
+      0.2.0.10-alpha. Patch by dgoulet.
+
+  o Minor bugfixes (authority):
+    - Don't assign "HSDir" to a router if it isn't Valid and Running.
+      Fixes bug 16524; bugfix on 0.2.7.2-alpha.
+    - Downgrade log messages about Ed25519 key issues, if they are in
+      old cached router descriptors. Fixes part of bug 16286; bugfix
+      on 0.2.7.2-alpha.
+    - When we find an Ed25519 key issue in a cached descriptor, stop
+      saying the descriptor was just "uploaded". Fixes another part of
+      bug 16286; bugfix on 0.2.7.2-alpha.
+
+  o Minor bugfixes (control port):
+    - Control port was using set_max_file_descriptors() with a limit set
+      to 0 to get the max value. A recent fix made this use case return
+      an error and introduced dead code in that function. This triggered
+      a warning that our limit (ConnLimit) was invalid but in reality it
+      was not.
+
+      Now, to the control port uses a specific getter function to query
+      the value and set_max_file_descriptors() should never be used
+      again for that purpose. Fixes bug 16697; bugfix on 0.2.7.2-alpha.
+
+  o Minor bugfixes (Ed25519):
+    - Fix a memory leak when reading router descriptors with expired
+      Ed25519 certificate. Fixes bug 16539; bugfix on 0.2.7.2-alpha.
+
+  o Minor bugfixes (linux seccomp2 sandbox):
+    - Allow bridge authorities to run correctly under the seccomp2
+      sandbox. Fixes bug 16964; bugfix on 0.2.5.1-alpha.
+    - Allow routers with ed25519 keys to run correctly under the
+      seccomp2 sandbox. Fixes bug 16965; bugfix on 0.2.7.2-alpha.
+
+  o Minor bugfixes (relay):
+    - Unblock threads before releasing the mutex to ensure predictable
+      scheduling behavior. Fixes bug 16644; bugfix on 0.2.6.3-alpha.
+
+  o Code simplification and refactoring:
+    - Change the function that's called when we need to retry all
+      downloads so that it only reschedules the downloads to happen
+      immediately, rather than launching them all at once itself. This
+      further simplifies Tor's callgraph.
+    - Move some format-parsing functions out of crypto.c and
+      crypto_curve25519.c into crypto_format.c and/or util_format.c.
+    - Move the client-only parts of init_keys() into a separate
+      function. Closes ticket 16763.
+    - Simplify the microdesc_free() implementation so that it no longer
+      appears (to code analysis tools) to potentially invoke a huge
+      suite of other microdesc functions.
+    - Simply the control graph further by deferring the inner body of
+      directory_all_unreachable() into a callback. Closes ticket 16762.
+    - Treat the loss of an owning controller as equivalent to a SIGTERM
+      signal. This removes a tiny amount of duplicated code, and
+      simplifies our callgraph. Closes ticekt 16788.
+    - When generating an event to send to the controller, we no longer
+      put the event over the network immediately. Instead, we queue
+      these events, and use a Libevent callback to deliver them. This
+      change simplifies Tor's callgraph by reducing the number of
+      functions from which all other Tor functions are reachable. Closes
+      ticket 16695.
+    - Wrap windows-only C files inside '#ifdef _WIN32' so that tools
+      that try to scan or compile every file on Unix won't decide that
+      they are broken.
+
+  o Code simplifications and refactoring:
+    - Remove the unused "nulterminate" argument from buf_pullup().
+
+  o Documentation:
+    - Recommend a 40 GB example AccountingMax in torrc.sample rather
+      than a 4 GB max. Closes ticket 16742.
+
+  o Removed code:
+    - The internal pure-C tor-fw-helper tool is now removed from the Tor
+      distribution, in favor of the pure-Go clone available from
+      https://github.com/Yawning/tor-fw-helper . The libraries used by
+      the C tor-fw-helper are not, in our opinion, very confidence-
+      inspiring in their secure-proggramming techniques. Closes
+      ticket 13338.
+
+  o Removed features:
+    - Remove the code that would try to aggressively flush controller
+      connections while writing to them. This code was introduced in
+      0.1.2.7-alpha, in order to keep output buffers from exceeding
+      their limits. But there is no longer a maximum output buffer size,
+      and flushing data in this way caused some undesirable recursions
+      in our call graph. Closes ticket 16480.
+
+  o Testing:
+    - Add a new set of callgraph analysis scripts that use clang to
+      produce a list of which Tor functions are reachable from which
+      other Tor functions. We're planning to use these to help simplify
+      our code structure by identifying illogical dependencies.
+    - Add new 'test-full' and 'test-full-online' targets to run all
+      tests, including integration tests with stem and chutney.
+    - Make the test-workqueue test work on windows by initializing the
+      network before we begin.
+    - New make target (make test-network-all) to run multiple applicable
+      chutney test cases. Patch from Teor; closes 16953.
+    - Unit test dns_resolve(), dns_clip_ttl() and dns_get_expiry_ttl()
+      functions in dns.c. Implements a portion of ticket 16831.
+    - When building Tor with testing coverage enabled, run Chutney tests
+      (if any) using the 'tor-cov' coverage binary.
+    - When running test-network or test-stem, check for the absence of
+      stem/chutney before doing any build operations.
+
+
 Changes in version 0.2.7.2-alpha - 2015-07-27
   This, the second alpha in the Tor 0.2.7 series, has a number of new
   features, including a way to manually pick the number of introduction
diff --git a/changes/16679_16685_etc b/changes/16679_16685_etc
deleted file mode 100644
index 46f3e33f5..000000000
--- a/changes/16679_16685_etc
+++ /dev/null
@@ -1,12 +0,0 @@
-  o Major features (relay, Ed25519):
-    - Significant improvements to the usability of relay-side Ed25519
-      key management. Log messages are better, and the code can
-      recover from far more failure conditions.  Thanks to "s7r" for
-      reporting and diagnosing so many of these!
-
-  o Major bugfixes (relay, Ed25519):
-    - Avoid crashing on 'tor --keygen'. Fixes bug 16679; bugfix on
-      0.2.7.2-alpha. Reported by "s7r".
-    - Improve handling of expired signing keys along with offline
-      master keys. Fixes bug 16685; bugfix on 0.2.7.2-alpha. Reported
-      by "s7r".
diff --git a/changes/autodetect-chutney-path b/changes/autodetect-chutney-path
deleted file mode 100644
index 4da6b246e..000000000
--- a/changes/autodetect-chutney-path
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (testing):
-    - Autodetect CHUTNEY_PATH if the chutney and tor sources are
-      side-by-side in the same parent directory.
-      Closes ticket 16903. Patch by "teor".
diff --git a/changes/bug14917 b/changes/bug14917
deleted file mode 100644
index f26f7c237..000000000
--- a/changes/bug14917
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Major features (security, hidden services):
-    - For an hidden service, it is now prohibited to use one single
-      EntryNodes to avoid a very easy guard discovery attack. For more
-      details, see the ticket description here:
-      https://trac.torproject.org/projects/tor/ticket/14917. Fixes ticket 14917.
-
diff --git a/changes/bug15963 b/changes/bug15963
deleted file mode 100644
index 5d109fe1a..000000000
--- a/changes/bug15963
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (Hidden service directory)
-    - Relays need to have the Fast flag to get the HSDir flag. As this is
-      being written, we'll go from 2745 HSDirs down to 2342, a ~14% drop.
-      Fixes ticket 15963.
diff --git a/changes/bug16274 b/changes/bug16274
deleted file mode 100644
index 6c415e87e..000000000
--- a/changes/bug16274
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfix (open file limit):
-    - Fix set_max_file_descriptors() to set by default the max open file
-      limit to the current limit in case setrlimit() fails so we at least
-      have a usable value; Fixes bug 16274; bugfix on tor-0.2.0.10-alpha.
-      Patch by dgoulet.
diff --git a/changes/bug16286 b/changes/bug16286
deleted file mode 100644
index 7b3049357..000000000
--- a/changes/bug16286
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Minor bugfixes (authority):
-    - Downgrade log messages about Ed25519 key issues, if they are in
-      old cached router descriptors. Fixes part of bug 16286; bugfix on
-      0.2.7.2-alpha.
-
-    - When we find an Ed25519 key issue in a cached descriptor, stop saying
-      the descriptor was just "uploaded". Fixes another part of bug 16286;
-      bugfix on 0.2.7.2-alpha.
diff --git a/changes/bug16389 b/changes/bug16389
deleted file mode 100644
index c9b10e528..000000000
--- a/changes/bug16389
+++ /dev/null
@@ -1,13 +0,0 @@
-  o Minor features (hidden service)
-    Client now uses an introduction point failure cache to know when to
-    fetch or keep a descriptor in their cache.
-
-    When fetching a descriptor, for every introduction points in it, we look
-    them up in the failure cache to know if we keep the descriptor or not.
-    For this to work, everytime an introduction points is discarded (ex:
-    receiving a NACK), we note it down in our introduction cache. If all
-    introduction points for an onion service are in our failure cache, we
-    discard the descriptor and fetch a new one.
-
-    See rendcache.c for a detailed explanation of the cache's behavior.
-    Closes ticket 16389.
\ No newline at end of file
diff --git a/changes/bug16524 b/changes/bug16524
deleted file mode 100644
index 1268fe8ca..000000000
--- a/changes/bug16524
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (authority):
-    - Don't assign "HSDir" to a router if it isn't Valid and Running.
-      Fixes bug 16524; bugfix on 0.2.7.2-alpha.
\ No newline at end of file
diff --git a/changes/bug16539 b/changes/bug16539
deleted file mode 100644
index 8a0b6d251..000000000
--- a/changes/bug16539
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (Ed25519):
-    - Fix a memory leak when reading router descriptors with
-      expired Ed25519 certificate. Fixes bug 16539; bugfix on 0.2.7.2-alpha.
-      
diff --git a/changes/bug16644 b/changes/bug16644
deleted file mode 100644
index f7126bdc9..000000000
--- a/changes/bug16644
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (relay):
-    - Unblock threads before releasing the mutex to ensure predictable
-      scheduling behavior. Fixes bug 16644; bugfix on 0.2.6.3-alpha.
diff --git a/changes/bug16697 b/changes/bug16697
deleted file mode 100644
index eb65a8843..000000000
--- a/changes/bug16697
+++ /dev/null
@@ -1,10 +0,0 @@
-  o Minor bugfixes (control port):
-    - Control port was using set_max_file_descriptors() with a limit set to
-      0 to get the max value. A recent fix made this use case return an
-      error and introduced dead code in that function. This triggered a
-      warning that our limit (ConnLimit) was invalid but in reality it was
-      not.
-
-      Now, to the control port uses a specific getter function to query the
-      value and set_max_file_descriptors() should never be used again for
-      that purpose. Fixes bug 16697; bugfix on 0.2.7.2-alpha.
diff --git a/changes/bug16741 b/changes/bug16741
deleted file mode 100644
index ce3dfdcfc..000000000
--- a/changes/bug16741
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - Check correctly for windows socket errors in the workqueue backend.
-      Fixes bug 16741; bugfix on 0.2.6.3-alpha.
diff --git a/changes/bug16742 b/changes/bug16742
deleted file mode 100644
index 2002cb7c7..000000000
--- a/changes/bug16742
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Documentation:
-    - Recommend a 40 GB example AccountingMax in torrc.sample rather
-      than a 4 GB max. Closes ticket 16742.
diff --git a/changes/bug16901 b/changes/bug16901
deleted file mode 100644
index c008ebdbd..000000000
--- a/changes/bug16901
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (compilation):
-    - Give a warning as early as possible when trying to build with an
-      unsupported OpenSSL version.  Closes ticket 16901.
diff --git a/changes/bug16913 b/changes/bug16913
deleted file mode 100644
index b07a782f1..000000000
--- a/changes/bug16913
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes:
-    - Fix an usage message of tor-resolve(1) so that it no longer lists
-      the removed -F option. Fixes bug 16913; bugfix on Tor
-      0.2.2.28-beta.
diff --git a/changes/bug16924 b/changes/bug16924
deleted file mode 100644
index 2d8b37226..000000000
--- a/changes/bug16924
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - When calling channel_free_list(), avoid calling smartlist_remove()
-      while inside a FOREACH loop. This partially reverts commit
-      17356fe7fd96af where the correct SMARTLIST_DEL_CURRENT was
-      removed.  Fixes bug 16924; bugfix on 0.2.4.4-alpha.
-
diff --git a/changes/bug16929 b/changes/bug16929
deleted file mode 100644
index 83e60d7eb..000000000
--- a/changes/bug16929
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes:
-    - include the TUNING document in our source tarball. It is referred
-      to in the ChangeLog and an error message. Fixes bug 16929; bugfix
-      on 0.2.6.1-alpha.
-
diff --git a/changes/bug16964 b/changes/bug16964
deleted file mode 100644
index 46ff565fc..000000000
--- a/changes/bug16964
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (linux seccomp2 sandbox):
-    - Allow bridge authorities to run correctly under the seccomp2
-      sandbox. Fixes bug 16964; bugfix on 0.2.5.1-alpha.
-
diff --git a/changes/bug16965 b/changes/bug16965
deleted file mode 100644
index 13af1372b..000000000
--- a/changes/bug16965
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (linux seccomp2 sandbox):
-    - Allow routers with ed25519 keys to run correctly under the seccomp2
-      sandbox. Fixes bug 16965; bugfix on 0.2.7.2-alpha.
-
diff --git a/changes/bug16980 b/changes/bug16980
deleted file mode 100644
index 43a817e92..000000000
--- a/changes/bug16980
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-
-    - Fix the behavior of crypto_time_t when told to consider times
-      before 1970. (These times were possible when running in a
-      simulated network environment where time()'s output starts at
-      zero.) Fixes bug 16980; bugfix on 0.2.7.1-alpha.
diff --git a/changes/callgraph b/changes/callgraph
deleted file mode 100644
index 64f7f9cf2..000000000
--- a/changes/callgraph
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Testing:
-    - Add a new set of callgraph analysis scripts that use clang to
-      produce a list of which Tor functions are reachable from which
-      other Tor functions. We're planning to use these to help simplify
-      our code structure by identifying illogical dependencies.
diff --git a/changes/chutney-coverage b/changes/chutney-coverage
deleted file mode 100644
index 53983c87f..000000000
--- a/changes/chutney-coverage
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Testing:
-    - When building Tor with testing coverage enabled, run Chutney tests
-      (if any) using the 'tor-cov' coverage binary.
diff --git a/changes/decouple-write-handle_write b/changes/decouple-write-handle_write
deleted file mode 100644
index 4ef9b3fba..000000000
--- a/changes/decouple-write-handle_write
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Removed features:
-    - Remove the code that would try to aggressively flush controller
-      connections while writing to them.  This code was introduced in
-      0.1.2.7-alpha, in order to keep output buffers from exceeding their
-      limits.  But there is no longer a maximum output buffer size, and
-      flushing data in this way caused some undesirable recursions
-      in our call graph. Closes ticket 16480.
diff --git a/changes/decouple_control_events b/changes/decouple_control_events
deleted file mode 100644
index 67c9c11f8..000000000
--- a/changes/decouple_control_events
+++ /dev/null
@@ -1,8 +0,0 @@
-  o Code simplification and refactoring:
-    - When generating an event to send to the controller, we no longer
-      put the event over the network immediately.  Instead, we queue
-      these events, and use a Libevent callback to deliver them.
-      This change simplifies Tor's callgraph by reducing the number
-      of functions from which all other Tor functions are reachable.
-      Closes ticket 16695.
-
diff --git a/changes/decouple_dir_all_unreachable b/changes/decouple_dir_all_unreachable
deleted file mode 100644
index 1e57b3dfb..000000000
--- a/changes/decouple_dir_all_unreachable
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplification and refactoring:
-    - Simply the control graph further by deferring the inner body of
-      directory_all_unreachable() into a callback. Closes ticket
-      16762.
\ No newline at end of file
diff --git a/changes/decouple_init_keys b/changes/decouple_init_keys
deleted file mode 100644
index 7f48d2b9d..000000000
--- a/changes/decouple_init_keys
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Move the client-only parts of init_keys() into a separate function.
-      Closes ticket 16763.
diff --git a/changes/decouple_lost_owner b/changes/decouple_lost_owner
deleted file mode 100644
index 88adb1854..000000000
--- a/changes/decouple_lost_owner
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplification and refactoring:
-    - Treat the loss of an owning controller as equivalent to a SIGTERM
-      signal. This removes a tiny amount of duplicated code, and simplifies
-      our callgraph. Closes ticekt 16788.
diff --git a/changes/decouple_retry_directory b/changes/decouple_retry_directory
deleted file mode 100644
index 11f901b04..000000000
--- a/changes/decouple_retry_directory
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Code simplification and refactoring:
-    - Change the function that's called when we need to retry all downloads
-      so that it only reschedules the downloads to happen immediately, rather
-      than launching them all at once itself.  This further simplifies
-      Tor's callgraph.
-
diff --git a/changes/early-check-paths b/changes/early-check-paths
deleted file mode 100644
index 44bebbe66..000000000
--- a/changes/early-check-paths
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Testing:
-    - When running test-network or test-stem, check for the absence
-      of stem/chutney before doing any build operations.
\ No newline at end of file
diff --git a/changes/feature14175-chutney-performance b/changes/feature14175-chutney-performance
deleted file mode 100644
index 1dd03f5ee..000000000
--- a/changes/feature14175-chutney-performance
+++ /dev/null
@@ -1,9 +0,0 @@
-  o Major enhancements (performance testing):
-    - Add chutney performance testing support to src/test/test-network.sh
-      The following arguments change how chutney verifies the network:
-      "--bytes n" sends n bytes per test connection;
-      "--connections n" makes n test connections per client; and
-      "--hs-multi-client 1" makes each client connect to each HS.
-      Requires the corresponding chutney performance testing changes.
-      Note: using --connections 7 or greater on a HS will trigger issue 15937.
-      Patch by "teor". Closes ticket 14175.
diff --git a/changes/feature14882-TestingDirAuthVoteIsStrict b/changes/feature14882-TestingDirAuthVoteIsStrict
deleted file mode 100644
index 62d513e27..000000000
--- a/changes/feature14882-TestingDirAuthVoteIsStrict
+++ /dev/null
@@ -1,18 +0,0 @@
-  o Minor features (testing, authorities):
-    - New TestingDirAuthVote{Exit,Guard,HSDir}IsStrict flags.
-      "A node will never receive the corresponding flag unless
-       that node is specified in the
-       TestingDirAuthVote{Exit,Guard,HSDir} list, regardless of
-       its uptime, bandwidth, exit policy, or DirPort".
-      Closes ticket 14882. Patch by "robgjansen", modified by
-      "teor" as VoteOnHidServDirectoriesV2 is now obsolete.
-      Commit message and changes file by "teor" & "robgjansen".
-  o Minor features (testing, authorities, documentation):
-    - Fix an error in the manual page and comments for
-      TestingDirAuthVoteHSDir[IsStrict], which suggested that a
-      HSDir required "ORPort connectivity". While this is true,
-      it is in no way unique to the HSDir flag. Of all the flags,
-      only HSDirs need a DirPort configured in order for the
-      authorities to assign that particular flag.
-      Fixed as part of 14882. Patch by "teor".
-      Bugfix on 0.2.6.3 (f9d57473e1ff on 10 January 2015).
diff --git a/changes/feature15482 b/changes/feature15482
deleted file mode 100644
index 4e32d394b..000000000
--- a/changes/feature15482
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor features (client-side privacy)
-    - Indefinitely extend circuit lifespan by resetting dirtyness, if
-      IsolateSOCKSAuth is in use, the new `KeepAliveIsolateSOCKSAuth`
-      option is set, and streams with SOCKS authentication are attached
-      to the circuit. Implements feature 15482.
diff --git a/changes/feature16533 b/changes/feature16533
deleted file mode 100644
index e9fea94c7..000000000
--- a/changes/feature16533
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (performance)
-    - Improve the runtime speed of Ed25519 signature verification by using
-      Ed25519-donna's batch verification support when there are a lot of
-      signatures to verify at once. Implements ticket 16533.
diff --git a/changes/feature16535 b/changes/feature16535
deleted file mode 100644
index 3df46b658..000000000
--- a/changes/feature16535
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (performance)
-    - Improve the runtime speed of Ed25519 operations and Curve25519 keypair
-      generation when built targeting 32 bit x86 platforms with SSE2
-      available. Implements ticket 16535.
diff --git a/changes/geoip-july2015 b/changes/geoip-july2015
deleted file mode 100644
index 381c2df23..000000000
--- a/changes/geoip-july2015
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features:
-    - Update geoip and geoip6 to the July 8 2015 Maxmind GeoLite2 Country database.
-
diff --git a/changes/malformed-hostname-safe-logging b/changes/malformed-hostname-safe-logging
deleted file mode 100644
index e56142594..000000000
--- a/changes/malformed-hostname-safe-logging
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes:
-    - When logging malformed hostnames in socks5 requests, respect
-      SafeLogging configuration. Fixes bug 16891; bugfix on 0.1.1.16-rc.
diff --git a/changes/microdesc_cycle b/changes/microdesc_cycle
deleted file mode 100644
index fddc2be60..000000000
--- a/changes/microdesc_cycle
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplification and refactoring:
-    - Simplify the microdesc_free() implementation so that it no longer
-      appears (to code analysis tools) to potentially invoke a huge suite
-      of other microdesc functions.
diff --git a/changes/move_formatting_functions b/changes/move_formatting_functions
deleted file mode 100644
index 4ad5806f2..000000000
--- a/changes/move_formatting_functions
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Code simplification and refactoring:
-    - Move some format-parsing functions out of crypto.c and
-      crypto_curve25519.c into crypto_format.c and/or util_format.c.
diff --git a/changes/normalize_exit b/changes/normalize_exit
deleted file mode 100644
index 300aace55..000000000
--- a/changes/normalize_exit
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-    - Try harder to normalize the exit status of the Tor process to the
-      standard-provided range. Fixes bug 16975; bugfix on every version
-      of Tor ever.
diff --git a/changes/pullup_nulterm b/changes/pullup_nulterm
deleted file mode 100644
index 3f3bd5447..000000000
--- a/changes/pullup_nulterm
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Code simplifications and refactoring:
-    - Remove the unused "nulterminate" argument from buf_pullup().
diff --git a/changes/test-full b/changes/test-full
deleted file mode 100644
index 5ff51db80..000000000
--- a/changes/test-full
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Testing:
-    - Add new 'test-full' and 'test-full-online' targets to run all tests,
-      including integration tests with stem and chutney.
diff --git a/changes/test-net-all b/changes/test-net-all
deleted file mode 100644
index 9a2e5ed77..000000000
--- a/changes/test-net-all
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Testing:
-    - New make target (make test-network-all) to run multiple applicable
-      chutney test cases. Patch from Teor; closes 16953.
diff --git a/changes/test-network-bridges-hs b/changes/test-network-bridges-hs
deleted file mode 100644
index a8f3521f3..000000000
--- a/changes/test-network-bridges-hs
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features (testing, bridges, hidden services):
-    - Make "bridges+hs" the default test network. This tests almost all
-      tor functionality during make test-network, while allowing tests
-      to succeed on non-IPv6 systems.
-      Requires chutney commit 396da92 in test-network-bridges-hs.
-      Closes tickets 16945 (tor), 16946 (chutney) . Patches by "teor".
diff --git a/changes/test-workqueue-windows b/changes/test-workqueue-windows
deleted file mode 100644
index 8d7b7f664..000000000
--- a/changes/test-workqueue-windows
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Testing:
-    - Make the test-workqueue test work on windows by initializing the
-      network before we begin.
diff --git a/changes/ticket13338 b/changes/ticket13338
deleted file mode 100644
index a1d242fcc..000000000
--- a/changes/ticket13338
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Removed code:
-    - The internal pure-C tor-fw-helper tool is now removed from the
-      Tor distribution, in favor of the pure-Go clone available from
-      https://github.com/Yawning/tor-fw-helper .  The libraries used
-      by the C tor-fw-helper are not, in our opinion, very confidence-
-      inspiring in their secure-proggramming techniques. Closes ticket 13338.
diff --git a/changes/ticket15254-hs-stats-default b/changes/ticket15254-hs-stats-default
deleted file mode 100644
index e447c24b3..000000000
--- a/changes/ticket15254-hs-stats-default
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Hidden Service Statistics
-    - Turn on hidden service statistics collection by setting the torrc
-      option HiddenServiceStatistics to "1" by default. Closes ticket
-      15254.
diff --git a/changes/ticket16831_part1 b/changes/ticket16831_part1
deleted file mode 100644
index 3ced08914..000000000
--- a/changes/ticket16831_part1
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Testing:
-    - Unit test dns_resolve(), dns_clip_ttl() and dns_get_expiry_ttl()
-      functions in dns.c. Implements a portion of ticket 16831.
diff --git a/changes/windows_only_files b/changes/windows_only_files
deleted file mode 100644
index 0ec64b9c4..000000000
--- a/changes/windows_only_files
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Code simplification and refactoring:
-    - Wrap windows-only C files inside '#ifdef _WIN32' so that tools that
-      try to scan or compile every file on Unix won't decide that they
-      are broken.
diff --git a/changes/workqueue_reply_t b/changes/workqueue_reply_t
deleted file mode 100644
index c2d3f4ad6..000000000
--- a/changes/workqueue_reply_t
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes:
-    - Ensure that worker threads actually exit when a fatal error or
-      shutdown is indicated. This doesn't currently affect the behaviour
-      of Tor, because Tor never indicates fatal error or shutdown except
-      in its unit tests. Fixes bug 16868; bugfix on 0.2.6.3-alpha.
-