[tor-commits] [torbutton/master] Fold in maint-1.9.4 changes

[gk at torproject.org]

commit fb3b883afda5acc1ab63ffd200720dda8c4ae0a2
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Mar 16 07:40:57 2016 +0000

    Fold in maint-1.9.4 changes
---
 src/CHANGELOG | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index fc5e96a..95f5822 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,6 @@
+1.9.4.5
+ * Bug 18557: Exempt Graphite preference from Security Slider
+
 1.9.5.1
  * Bug 16990: Don't mishandle multiline commands
  * Bug 18144: about:tor update arrow position is wrong
@@ -5,6 +8,12 @@
  * Bug 16017: Allow users to more easily set a non-tor SSH proxy
  * Translation updates
 
+1.9.4.4
+ * Bug 16990: Don't mishandle multiline commands
+ * Bug 18144: about:tor update arrow position is wrong
+ * Bug 16725: Allow resizing with non-default homepage
+ * Translation updates
+
 1.9.5
  * Bug 16990: Show circuit display for connections using multi-party channels
  * Bug 18019: Avoid empty prompt shown after non-en-US update