1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index bef450bc7f..f8841f5e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Oct  1 00:56:19 2016  Aaron Patterson <tenderlove@ruby-lang.org>
+
+	* lib/uri/generic.rb (def check_password): don't include bad password
+	  in URI exception output
+
+	* test/uri/test_generic.rb (def test_set_component): test for behavior
+
 Sat Oct  1 00:55:19 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (nogvl_fsync, nogvl_fdatasync): on Windows, just ignore if the