commit 6809bbe766dbf6b3fccbf950d67baa71eae5a25a Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 24 12:37:21 2018 -0400

Fold in one more changelog entry --- ChangeLog | 5 +++++ changes/27286 | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 2012eb644..6e61813ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,11 @@ Changes in version 0.3.4.7-rc - 2018-08-2? - Use cargo cache in our Travis CI configuration. Closes ticket 26952.

+ o Minor features (directory authorities): + - Authorities no longer vote to make the subprotocol version + "LinkAuth=1" a requirement: it is unsupportable with NSS, and + hasn't been needed since Tor 0.3.0.1-alpha. Closes ticket 27286. + o Minor features (geoip): - Update geoip and geoip6 to the August 7 2018 Maxmind GeoLite2 Country database. Closes ticket 27089. diff --git a/changes/27286 b/changes/27286 deleted file mode 100644 index 5f5f7a4ae..000000000 --- a/changes/27286 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (directory authorities): - - Authorities no longer vote to make the subprotocol version "LinkAuth=1" - a requirement: it is unsupportable with NSS, and hasn't been needed - since Tor 0.3.0.1-alpha. Closes ticket 27286.