From d53ab62e5e85309ae42b3d32392d60fc273a490e Mon Sep 17 00:00:00 2001
From: Ben Moskovitz <ben.m@buildkite.com>
Date: Fri, 27 May 2022 11:10:06 +1200
Subject: [PATCH] Bump version + changelog for v3.36.1

---
 CHANGELOG.md     | 6 ++++++
 agent/version.go | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea51932481..5c14138605 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [v3.36.1](https://github.com/buildkite/agent/tree/v3.36.1) (2022-05-27)
+[Full Changelog](https://github.com/buildkite/agent/compare/v3.36.0...v3.36.1)
+
+### Fixed
+- Fix nil pointer deref when using --log-format json [#1653](https://github.com/buildkite/agent/pull/1653) (@moskyb)
+
 ## [v3.36.0](https://github.com/buildkite/agent/tree/v3.36.0) (2022-05-17)
 [Full Changelog](https://github.com/buildkite/agent/compare/v3.35.2...v3.36.0)
 
diff --git a/agent/version.go b/agent/version.go
index e78b01ea50..84cb4ec03d 100644
--- a/agent/version.go
+++ b/agent/version.go
@@ -10,7 +10,7 @@ import "runtime"
 //
 // Pre-release builds' versions must be in the format `x.y-beta`, `x.y-beta.z` or `x.y-beta.z.a`
 
-var baseVersion string = "3.36.0"
+var baseVersion string = "3.36.1"
 var buildVersion string = ""
 
 func Version() string {