commit 72b101e8adfee0df3bebef40193112bd2453e8b9 Author: Karsten Loesing karsten.loesing@gmx.net Date: Fri Apr 15 17:22:12 2016 +0200

Move CHANGELOG entry for #17934 to next version. --- CHANGELOG.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md index b4b24d5..d427621 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version ?.?.? - 2016-??-?? + + * Medium changes + - Include the hostname in directory source entries of consensuses + and votes. + + # Changes in version 1.1.0 - 2015-12-28

* Medium changes @@ -26,8 +33,6 @@ - Support hidden-service statistics in extra-info descriptors. - Support onion-key and ntor-onion-key cross certificates in server descriptors. - - Include the hostname in directory source entries of consensuses - and votes.

* Minor changes - Start using Java 7 features like the diamond operator and switch