From 45730cfab31ccd554f75e63016d08fec63293d5f Mon Sep 17 00:00:00 2001
From: Jeremy McNevin <jeremy.mcnevin@optum.com>
Date: Mon, 8 Apr 2019 12:51:15 -0500
Subject: [PATCH 1/2] cmd/geth: fix accidental --rpccorsdomain and --rpcvhosts
 removal

---
 cmd/geth/main.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 458608112b0f..6f605bd1ca33 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -125,6 +125,8 @@ var (
 		utils.VMEnableDebugFlag,
 		utils.NetworkIdFlag,
 		utils.ConstantinopleOverrideFlag,
+		utils.RPCCORSDomainFlag,
+		utils.RPCVirtualHostsFlag,
 		utils.EthStatsURLFlag,
 		utils.MetricsEnabledFlag,
 		utils.FakePoWFlag,

From dc59af862299342d9b881b2fa06bea16839915d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Tue, 9 Apr 2019 10:58:00 +0300
Subject: [PATCH 2/2] params, swarm: hotfix Geth v1.8.25 release to restore rpc
 flags

---
 params/version.go        | 2 +-
 swarm/version/version.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/params/version.go b/params/version.go
index 7949d4fd1151..5abe2ab95a48 100644
--- a/params/version.go
+++ b/params/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 1        // Major version component of the current release
 	VersionMinor = 8        // Minor version component of the current release
-	VersionPatch = 24       // Patch version component of the current release
+	VersionPatch = 25       // Patch version component of the current release
 	VersionMeta  = "stable" // Version metadata to append to the version string
 )
 
diff --git a/swarm/version/version.go b/swarm/version/version.go
index d41110576ce0..6c393e9c7f92 100644
--- a/swarm/version/version.go
+++ b/swarm/version/version.go
@@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 0        // Major version component of the current release
 	VersionMinor = 3        // Minor version component of the current release
-	VersionPatch = 12       // Patch version component of the current release
+	VersionPatch = 13       // Patch version component of the current release
 	VersionMeta  = "stable" // Version metadata to append to the version string
 )