From 6effb781410499c4328b12d9b101b0ff7fd1b00d Mon Sep 17 00:00:00 2001
From: Omar Polo <op@omarpolo.com>
Date: Sun, 2 Jan 2022 16:38:59 +0000
Subject: [PATCH] sync changelog

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3ac0942..a4e0bc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-02  Omar Polo  <op@omarpolo.com>
+
+	* server.c (matched_proxy): allow to specify multiple proxy blocks and add matching rules
+
+	* parse.y (servbody): relax the strict ordering of options, location and proxy blocks
+
 2022-01-01  Omar Polo  <op@omarpolo.com>
 
 	* proxy.c (proxy_init): add support for client certificate when proxying