[tor-commits] [collector/master] Prepare for 1.2.0 release.

[karsten at torproject.org]

commit c9cf845d48f30623b42b8a17e09ce3b850325693
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Tue Jul 11 11:30:02 2017 +0200

    Prepare for 1.2.0 release.
---
 CHANGELOG.md | 4 +++-
 build.xml    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73209db..61d8f1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,11 @@
-# Changes in version 1.?.? - 2017-??-??
+# Changes in version 1.2.0 - 2017-07-12
 
  * Major changes
    - Download .tpf files from OnionPerf hosts.
    - Stop downloading and merging .data and .extradata files from
      Torperf hosts.
+   - Update to metrics-lib 2.0.0.
+   - Update to Debian stretch libraries.
 
  * Medium changes
    - Clean up files in recent/exit-lists/ again.
diff --git a/build.xml b/build.xml
index 8b31b7a..fb46e17 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 
   <property name="javadoc-title" value="CollecTor API Documentation"/>
   <property name="implementation-title" value="CollecTor" />
-  <property name="release.version" value="1.1.2-dev" />
+  <property name="release.version" value="1.2.0" />
   <property name="project-main-class" value="org.torproject.collector.Main" />
   <property name="name" value="collector"/>
   <property name="metricslibversion" value="2.0.0" />