From a05f401ea982fe6e60235dd7967c63a5bcda2f48 Mon Sep 17 00:00:00 2001
From: Tyler Smalley <tyler@tailscale.com>
Date: Wed, 21 Jun 2023 13:25:10 -0700
Subject: [PATCH] changelog: v0.4.3 (#70)

Signed-off-by: Tyler Smalley <tyler@tailscale.com>
---
 CHANGELOG.md    | 46 +++++++++++++++++++++++++++++++++++++++++-----
 CONTRIBUTING.md | 15 +++++++++++++--
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02423e9..f129c0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,45 @@
-# Change Log
+# Changelog
 
-All notable changes to the "vscode-tailscale" extension will be documented in this file.
+All notable changes to this project will be documented in this file.
 
-Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file.
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to an [Odd-Even Versioning](https://en.wikipedia.org/wiki/Software_versioning#Odd-numbered_versions_for_development_releases) scheme. Odd-numbered versions are used for development and pre-release updates, while even-numbered versions are used for stable or public releases.
 
-## [Unreleased]
+## [0.4.3] - 2023-06-21
 
-- Initial release
+### Fixed
+
+- Use sudo-prompt to re-run tsrelay in Linux (#64)
+- src/tailscale/cli: fix go path for development mode (#67)
+- Return manual resolution when access is denied to LocalBackend (#60)
+- Output server details as json (#37)
+
+### Changed
+
+- Upgrade dependencies: react, typescript, webpack, eslint, prettier, postcss, tailwindcss, lint-staged (#38, #39, #40, #41, #43, #44, #46, #47, #50, #53)
+
+## [0.4.2] - 2023-06-13
+
+### Added
+
+- serve/simple: Notice for Linux users (#62)
+
+## [0.4.1] - 2023-06-13
+
+### Added
+
+- Show error message for expired node key (#1)
+- Provide information on service underlying a proxy (#2)
+- readme: Added notice for Linux users (#61)
+
+### Changed
+
+- portdisco: switch to upstream portlist package (#10)
+- Upgrade dependencies: webpack, webpack-cli, webpack-dev-server, css-loader, postcss-loader, style-loader, ts-loader (#34)
+
+Initial public release
+
+## [0.4.0] - 2023-05-31
+
+### Added
+
+- Simple view for adding a Funnel
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5f72681..0608b9f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -73,8 +73,6 @@ To backport a PR, add the `auto-backport` label to a PR and a corresponding vers
 
 ## Release Process
 
-### Create or update an existing release branch
-
 #### To make a new minor release. (e.g., `0.2` ⇒ `0.4`)
 
 From the `main` branch:
@@ -92,6 +90,17 @@ git checkout release-branch/0.2
 $ git cherry-pick -x <commit-id>
 ```
 
+### Update CHANGELOG.md
+
+Using the diff between the latest tag, and the release branch after cherry picking
+
+```
+git log --pretty=oneline v0.2.1..release-branch/v0.2
+```
+
+Group changes by `Added`, `Changed`, `Deprecated`, `Removed`, `Fixed`, and `Security`
+Open a pull-request for the changes and cherry-pick into the release branch
+
 ### Update the version
 
 ```
@@ -100,6 +109,8 @@ $ git add package.json && git commit -sm 'version: v0.2.1'
 $ git tag -am "Relase 0.2.1" "v0.2.1"
 ```
 
+### Create or update an existing release branch
+
 ### Push the release branch and tag
 
 ```