commit 66c1bc9fabb40ef7c135db933ebc35b5567986b2 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 7 10:49:48 2017 -0400

Use the correct TROVE id for #22753. --- ChangeLog | 4 ++-- ReleaseNotes | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 9f3dc46..0319bbf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,7 +19,7 @@ Changes in version 0.3.1.4-alpha - 2017-06-29 - When choosing which guard to use for a circuit, avoid the exit's family along with the exit itself. Previously, the new guard selection logic avoided the exit, but did not consider its family. - Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016- + Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2017- 006 and CVE-2017-0377.

o Major bugfixes (compression, zstd): @@ -142,7 +142,7 @@ Changes in version 0.3.0.9 - 2017-06-29 - When choosing which guard to use for a circuit, avoid the exit's family along with the exit itself. Previously, the new guard selection logic avoided the exit, but did not consider its family. - Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016- + Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2017- 006 and CVE-2017-0377.

o Major bugfixes (entry guards, backport from 0.3.1.1-alpha): diff --git a/ReleaseNotes b/ReleaseNotes index 80c3e4c..cc58001 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -16,7 +16,7 @@ Changes in version 0.3.0.9 - 2017-06-29 - When choosing which guard to use for a circuit, avoid the exit's family along with the exit itself. Previously, the new guard selection logic avoided the exit, but did not consider its family. - Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016- + Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2017- 006 and CVE-2017-0377.

o Major bugfixes (entry guards, backport from 0.3.1.1-alpha):