From 6ba39a50b37b13ffec0343b1064c83431ba8f40e Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Wed, 10 Nov 2010 21:58:51 -0800
Subject: [PATCH] docs: NEWS: merge two additions

---
 NEWS | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/NEWS b/NEWS
index 29e56485..f0a86adc 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,19 @@
    involving a non-ASCII filename. (#1224)
  - Fix a rarely-encountered bug involving printing large strings to
    the console on Windows. (#1232)
+ - Perform ~ expansion in the --exclude-from filename argument to
+   'tahoe backup'. (#1241)
+ - The CLI now ignores the HTTP_PROXY environment variable and
+   connects directly to the WAPI instead of going through an HTTP
+   proxy, thus avoiding giving caps to the HTTP proxy (and also
+   avoiding failures in the case that the HTTP proxy is failing or
+   requires authentication). (#1253)
+
+** Packaging
+
+ - Use a newer version of a dependency if needed, even if an older
+   version is installed. This would previously cause a VersionConflict
+   error. (#1190)
 
 * Release 1.8.0 (2010-09-23)
 
-- 
2.45.2