summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2015-02-28 13:08:05 -0400
committerJoey Hess2015-02-28 13:08:05 -0400
commit970ffbd0d6fbf3ab6ad36f867cfafbcfb2895324 (patch)
treeac15dabe7313a7383569be1384127bb1ce836145 /debian
parent8777dc2e55068ac6472a4975ef70ceef644407be (diff)
parentec64af82f0f87df939abb6dd0727628a2cd88906 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog11
1 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index dfe3b3c5..5dc849dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+propellor (2.2.0) UNRELEASED; urgency=medium
+
+ * When running shimmed (eg in a docker container),
+ improve process name visible in ps.
+ * Add shebang to cron.daily etc files.
+ * Some changes to tor configuration, minor API change.
+ * Propellor now builds itself, and gets its build dependencies installed
+ when deploying to a new host, without needing the Makefile.
+
+ -- Joey Hess <id@joeyh.name> Mon, 16 Feb 2015 19:00:48 -0400
+
propellor (2.1.0) unstable; urgency=medium
* Additional tor properties, including support for making relays,