From d61aec386234b3968f11adc49d9af1fc7376ffb5 Mon Sep 17 00:00:00 2001
From: Bill Church <wmchurch@gmail.com>
Date: Sat, 14 Mar 2020 11:08:28 -0400
Subject: [PATCH] chore: pull changelog and readme from master

---
 ChangeLog.md | 4 ++++
 README.md    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/ChangeLog.md b/ChangeLog.md
index c2ebc13..5e9fb58 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,4 +1,8 @@
 # Change Log
+### 0.2.10 [TBD]
+### Added
+- Add configuration option to restrict connections to specified subnets thanks to @Mierdin
+
 ### 0.2.9 [2019-06-13]
 ### Changes
 - Missing require('fs') in `server/app.js` See issue [#135](../../issues/135)
diff --git a/README.md b/README.md
index ff06c62..81b26f2 100644
--- a/README.md
+++ b/README.md
@@ -111,6 +111,8 @@ docker run --name webssh2 -d -p 2222:2222 -v `pwd`/app/config.json:/usr/src/conf
 
 * **ssh.keepaliveCountMax** - _integer_ - How many consecutive, unanswered SSH-level keepalive packets that can be sent to the server before disconnection (similar to OpenSSH's ServerAliveCountMax config option). **Default:** 10.
 
+* **allowedSubnets** - _array_ - A list of subnets that the server is allowed to connect to via SSH. An empty array means all subnets are permitted; no restriction. **Default:** empty array.
+
 * **terminal.cursorBlink** - _boolean_ - Cursor blinks (true), does not (false) **Default:** true.
 
 * **terminal.scrollback** - _integer_ - Lines in the scrollback buffer. **Default:** 10000.