From 4f4b34d481d32672e5f4940fe9c7b1cc146b886d Mon Sep 17 00:00:00 2001
From: Matthew Holt <Matthew.Holt+git@gmail.com>
Date: Wed, 16 Mar 2016 11:43:57 -0600
Subject: [PATCH] Update changelog

---
 dist/CHANGES.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dist/CHANGES.txt b/dist/CHANGES.txt
index 34b69d7d5..7fb0f558c 100644
--- a/dist/CHANGES.txt
+++ b/dist/CHANGES.txt
@@ -1,5 +1,9 @@
 CHANGES
 
+<master>
+- proxy: New max_conns setting to limit max connections per upstream
+- Internal improvements, restructuring, and bug fixes
+
 0.8.2 (February 25, 2016)
 - On-demand TLS can obtain certificates during handshakes
 - Built with Go 1.6