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

[karsten@xxxxxxxxxxxxxx]

commit 1510b0d060ea5b1c578b13767864ee7329332619
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Thu Nov 24 09:25:49 2016 +0100

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed368be..4ffc821 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,16 @@
-# Changes in version ?.?.? - 201?-??-??
+# Changes in version 1.1.1 - 2016-11-24
 
  * Medium changes
+   - Handle corrupt internal file used for checking references between
+     descriptors by deleting and regenerating instead of escalating.
    - Retain hidserv-* lines in sanitized extra-info descriptors.
    - Sign .jar files again, and ensure they get signed in the build
      process.
 
+ * Minor changes
+   - Add instructions and sample configuration for using nginx as HTTP
+     server rather than Apache.
+
 
 # Changes in version 1.1.0 - 2016-10-28
 
diff --git a/build.xml b/build.xml
index 916b8f5..1b3a9c2 100644
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,5 @@
 <project default="compile" name="CollecTor" basedir=".">
-  <property name="release.version" value="1.2.0-dev" />
+  <property name="release.version" value="1.1.1" />
   <property name="name" value="CollecTor"/>
   <property name="descriptorversion" value="1.5.0" />
   <property name="source-and-target-java-version" value="1.7" />



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits