pull in 3.1 changelog

Author: wileyj

CHANGELOG.md

@@ -9,7 +9,21 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ### Added
 
+### Changed
+
+## [3.1.0.0.1]
+
+### Added
+
 - A miner will now generate a tenure-extend when at least 70% of the signers have confirmed that they are willing to allow one, via the new timestamp included in block responses. This allows the miner to refresh its budget in between Bitcoin blocks. ([#5476](https://github.com/stacks-network/stacks-core/discussions/5476))
+
+### Changed
+
+## [3.1.0.0.0]
+
+### Added
+
+- **SIP-029 consensus rules, activating in epoch 3.1 at block 875,000** (see [SIP-029](https://github.com/stacksgov/sips/blob/main/sips/sip-029/sip-029-halving-alignment.md) for details)
 - New RPC endpoints
   - `/v2/clarity/marf/:marf_key_hash`
   - `/v2/clarity/metadata/:principal/:contract_name/:clarity_metadata_key`

stacks-signer/CHANGELOG.md

@@ -7,13 +7,28 @@ and this project adheres to the versioning scheme outlined in the [README.md](RE
 
 ## [Unreleased]
 
+## Added
+
+## Changed
+
+## [3.1.0.0.1.0]
+
 ### Added
 
 ### Changed
 
 - Added tenure extend timestamp to signer block responses
 - Added tenure_idle_timeout_secs configuration option for determining when a time-based tenure extend will be accepted
 
+## [3.1.0.0.0.0]
+
+### Added
+
+- **SIP-029 consensus rules, activating in epoch 3.1 at block 875,000** (see [SIP-029](https://github.com/will-corcoran/sips/blob/feat/sip-029-halving-alignment/sips/sip-029/sip-029-halving-alignment.md) for details)
+
+### Changed
+>>>>>>> chore/3.1.0.0.0_changelog
+
 ## [3.0.0.0.4.0]
 
 ### Added