From 88dbe5db8a14550fcd0748de6030a54559f1385e Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@users.noreply.github.com>
Date: Thu, 20 Sep 2018 09:49:39 -0400
Subject: [PATCH] chore(release): reflect latest patched releases (#7262)

Merge pull request 7262
---
 History.markdown        | 20 ++++++++++++++++++--
 docs/_config.yml        |  2 +-
 docs/latest_version.txt |  2 +-
 lib/jekyll/version.rb   |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/History.markdown b/History.markdown
index b82ec36b..8ca5d0f5 100644
--- a/History.markdown
+++ b/History.markdown
@@ -111,8 +111,6 @@
 
   * Add call to unused method `validate_options` in `commands/serve.rb` (#7122)
   * Security: fix `include` bypass of `EntryFilter#filter` symlink check (#7226)
-  * 3.8.x: security: fix `include` bypass of `EntryFilter#filter` symlink check (#7228)
-  * 3.6.x: security: fix `include` bypass of `EntryFilter#filter` symlink check (#7229)
   * Check if scope applies to type before given path (#7263)
 
 ### feature
@@ -120,6 +118,12 @@
   * Disable Liquid via front matter (#6824)
   * Do not process Liquid in post excerpt when disabled in front matter (#7146)
 
+## 3.8.4 / 2018-09-18
+
+### Bug Fixes
+
+  * 3.8.x: security: fix `include` bypass of `EntryFilter#filter` symlink check (#7228)
+
 ## 3.8.3 / 2018-06-05
 
 ### Bug Fixes
@@ -237,6 +241,12 @@
   * Handle liquid tags in excerpts robustly (#6891)
   * Allow front matter defaults to be applied properly to documents gathered under custom `collections_dir` (#6885)
 
+## 3.7.4 / 2018-09-07
+
+### Bug Fixes
+
+  * Security: fix `include` bypass of EntryFilter#filter symlink check (#7224)
+
 ## 3.7.3 / 2018-02-25
 
 ### Bug Fixes
@@ -403,6 +413,12 @@
   * Improve docs styling for code to be run in shell (#6641)
   * Fix permalink icon markup in news-item layout (#6639)
 
+## 3.6.3 / 2018-09-18
+
+### Bug Fixes
+
+  * 3.6.x: security: fix `include` bypass of `EntryFilter#filter` symlink check (#7229)
+
 ## 3.6.2 / 2017-10-21
 
 ### Development Fixes
diff --git a/docs/_config.yml b/docs/_config.yml
index 27ad51ff..c7beb844 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
 ---
-version: 3.8.3
+version: 3.8.4
 name: Jekyll • Simple, blog-aware, static sites
 description: Transform your plain text into static websites and blogs
 url: https://jekyllrb.com
diff --git a/docs/latest_version.txt b/docs/latest_version.txt
index 269aa9c8..ff313b8c 100644
--- a/docs/latest_version.txt
+++ b/docs/latest_version.txt
@@ -1 +1 @@
-3.8.3
+3.8.4
diff --git a/lib/jekyll/version.rb b/lib/jekyll/version.rb
index b673f1e0..b506c7ea 100644
--- a/lib/jekyll/version.rb
+++ b/lib/jekyll/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Jekyll
-  VERSION = "3.8.3"
+  VERSION = "3.8.4"
 end