summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess2016-09-10 11:39:05 -0400
committerJoey Hess2016-09-10 11:39:05 -0400
commit8742377d83147302c65f5cc824420538ff2f36be (patch)
treea749d73cf9146f7b3172401e02be282899b0247f /debian
parentc41c85b9ca9a7c5d6f1f7d4c76c9c61edb81b12b (diff)
parentfa64c0e49355b29e44d86371c827a632bc27d49a (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
1 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 8f5ae80b..b84e5690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
propellor (3.2.0) UNRELEASED; urgency=medium
+ [ Sean Whitton ]
* Using ccache with Sbuild.built & Sbuild.builtFor is now toggleable: these
properties now take a parameter of type Sbuild.UseCcache. (API Change)
* Sbuild.piupartsConf: no longer takes an Apt.Url. (API Change)
@@ -10,7 +11,13 @@ propellor (3.2.0) UNRELEASED; urgency=medium
This is for compatibility with `dgit sbuild`.
* Further improvements to Sbuild.hs haddock.
- -- Sean Whitton <spwhitton@spwhitton.name> Mon, 05 Sep 2016 11:14:52 -0700
+ [ Joey Hess ]
+ * Tor.hiddenService: Converted port parameter from Int to Port. (API change)
+ * Tor.hiddenServiceAvailable: The hidden service hostname file may not
+ be available immedaitely after configuring tor; avoid ugly error in
+ this case.
+
+ -- Joey Hess <id@joeyh.name> Thu, 01 Sep 2016 10:30:17 -0400
propellor (3.1.2) unstable; urgency=medium