From 54eab673c22e9ec146736a00e67a030afcac5e2d Mon Sep 17 00:00:00 2001
From: Brian Warner <warner@lothar.com>
Date: Tue, 21 Jan 2025 17:07:57 -0800
Subject: [PATCH] docs: describe BTC development with Magic Internet project

Update donations.rst with description of Magic Internet project, add
the 12HZ2rGfgcAqJY2Y55Dxt4Z2qUXiK2WFf8 transfer address.

Update expenses.rst with txns from the last few months.
---
 docs/donations.rst       | 23 +++++++++++++----------
 docs/expenses.rst        | 38 ++++++++++++++++++++++++++++++++++++++
 newsfragments/4163.other |  0
 3 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 newsfragments/4163.other

diff --git a/docs/donations.rst b/docs/donations.rst
index bc1d55c73..711984853 100644
--- a/docs/donations.rst
+++ b/docs/donations.rst
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 =========
 Donations
@@ -82,6 +82,9 @@ key on this list.
   ~$260k
   1KZYr8UU2XjuEdSPzn2pF8eRPZZvffByDf
 
+* Magic Internet project (2025)
+  2yr 20.0 BTC
+  12HZ2rGfgcAqJY2Y55Dxt4Z2qUXiK2WFf8
 
 Historical Donation Addresses
 =============================
@@ -109,17 +112,17 @@ This document is signed by the Tahoe-LAFS Release-Signing Key (GPG keyid
 (https://github.com/tahoe-lafs/tahoe-lafs.git) as `docs/donations.rst`.
 Both actions require access to secrets held closely by Tahoe developers.
 
-signed: Brian Warner, 25-Oct-2023
+signed: Brian Warner, 21-jan-2025
 
 
 -----BEGIN PGP SIGNATURE-----
 
-iQEzBAEBCAAdFiEE405i0G0Oac/KQXn/veDTHWhmanoFAmU5YZMACgkQveDTHWhm
-anqt+ggAo2kulNmjrWA5VhqE8i6ckkxQMRVY4y0LAfiI0ho/505ZBZvpoh/Ze31x
-ZJj4DczHmZM+m3L+fZyubT4ldagYEojtwkYmxHAQz2DIV4PrdjsUQWyvkNcTBZWu
-y5mR5ATk3EYRa19xGEosWK1OzW2kgRbpAbznuWsdxxw9vNENBrolGRsyJqRQHCiV
-/4UkrGiOegaJSFMKy2dCyDF3ExD6wT9+fdqC5xDJZjhD+SUDJnD4oWLYLroj//v1
-sy4J+/ElNU9oaC0jDb9fx1ECk+u6B+YiaYlW/MrZNqzKCM/76yZ8sA2+ynsOHGtL
-bPFpLJjX6gBwHkMqvkWhsJEojxkFVQ==
-=gxlb
+iQEzBAEBCgAdFiEE405i0G0Oac/KQXn/veDTHWhmanoFAmeQSRUACgkQveDTHWhm
+anr3Ygf/bTmpEwuFzY2vgUmE0kM+8BFrb/26J7DGKhg17ZXdknq6VdN62KnLXDrT
+xN7pjMoG99A0BALfCowHC98uhrxViG7ArLHP2AyIavwlpVgSqysAAbQ6r6499phe
+R5HlDkP+yu3LrUDI2G/1PzqI6F//khmYBahocCCuUeO2BXxNIv2i9ibCqmkJw6jw
+JTaBLKrExwaavcAVIPE7uhHu/Ak53Ym0rbotluT+tzMTJmEQ3CHV3M2VOpzEqY/7
+WNriNFMNGNKtGtsFog8LDgPIqwb93tUtLnDS72ZaNMs1epq8EtmoSGRCSNw8zDRU
+zDKPJdWBaQ9jMweou9yZMF5KdUh6mg==
+=/xUw
 -----END PGP SIGNATURE-----
diff --git a/docs/expenses.rst b/docs/expenses.rst
index fad8284f0..afd4652de 100644
--- a/docs/expenses.rst
+++ b/docs/expenses.rst
@@ -179,6 +179,7 @@ onwards into 2024.
 * Recipient: Open Collective (US)
 
   * Transfer Address: 1KZYr8UU2XjuEdSPzn2pF8eRPZZvffByDf
+  * Payment Address: 3LVNG26VxfE6RXJJjKCVNHnAGMtyDrx9WU
 
 The first phase transferred 7.5 BTC (about $250K).
 
@@ -205,3 +206,40 @@ The first phase transferred 7.5 BTC (about $250K).
   * xfer 6.0 BTC: txid 766fa17b43ab0d2a0c3d2839a59e9887abf3026d44ccecee42a348fb2cc05474, block 857,777
   * payment address: 3LVNG26VxfE6RXJJjKCVNHnAGMtyDrx9WU
   * send 5.999943 BTC: txid b44c8d4dbbfcef6eee2681700ccb8e3c6d7d56b3796ce8813848d2c91022d7a4, block 857,788
+* 10-dec-2024: 2.0 BTC ($200k) (current price: $97,745)
+  * transfer address: 1KZYr8UU2XjuEdSPzn2pF8eRPZZvffByDf
+  * xfer 2.0 BTC: txid 134afb660302a8f1940af32ea55b92719477dd77615d6457ffeabf99dd085773, block 874,225
+  * payment address: 3LVNG26VxfE6RXJJjKCVNHnAGMtyDrx9WU
+  * send 1.999943 BTC: txid 05bbeb58a7248bd542c9dab1562c561a98ece72bb44f65be82f50c7fc2c47b92, block 874,226
+* 21-jan-2025: 1.0 BTC ($106k) (current price: $105,923)
+  * transfer address: 1KZYr8UU2XjuEdSPzn2pF8eRPZZvffByDf
+  * xfer 1.0 BTC: txid c4b90f29136a8df546ce30bfa238dbb479020b85c26eb33b1f221382cec8c235, block 880,263
+  * payment address: 3LVNG26VxfE6RXJJjKCVNHnAGMtyDrx9WU
+  * send 0.999943 BTC: txid b480d111123b3de09ce8d757954a2ff47e4e8efce53b6ba81823a7ae9a10e8ff, block 880,270
+* 04-feb-2025: 3.0 BTC ($295k) (current price: $98,340)
+  * transfer address: 1KZYr8UU2XjuEdSPzn2pF8eRPZZvffByDf
+  * xfer 3.0 BTC: txid 478d682cf9b65e1ee5d0a6bcabf3d21d3615340288b1611a4f53e49d81d80394, block 882,334
+  * payment address: 3LVNG26VxfE6RXJJjKCVNHnAGMtyDrx9WU
+  * send 2.999943 BTC: txid 5734b5e06cd1d6576344be05d9087b2838f38330afd508a2c5866dc23f02bc67, block 882,335
+
+
+Magic Internet Project
+----------------------
+
+In January 2025, we started supporting the Magic Internet project with
+a two-year commitment of 10.0 BTC. Initially, the funds will be
+transferred in three-month chunks through Open Collective, but project
+intends to be established as a non-profit organization which can
+receive the remainder of the BTC directly.
+
+* Recipient: Magic Internet Project (via Open Collective)
+
+  * Transfer Address: 12HZ2rGfgcAqJY2Y55Dxt4Z2qUXiK2WFf8
+  * Payment Address: 3LVNG26VxfE6RXJJjKCVNHnAGMtyDrx9WU (same as above)
+
+* 18-jan-2025: ~3.0 BTC ($300k)
+  * transfer address: 12HZ2rGfgcAqJY2Y55Dxt4Z2qUXiK2WFf8
+  * xfer 0.1 BTC: txid d6e9688dfc75289343729c528914099671a1b82a80dfb6260b9791085e1445f3, block 880,266
+  * xfer 2.9 BTC: txid df060a796a449b67a78d3ac634f2b601f8b7c0b9b68e58cdfba3dd333d16fc3a, block 880,271
+  * payment address: 3LVNG26VxfE6RXJJjKCVNHnAGMtyDrx9WU
+  * send 2.9998986 BTC: 374e7ec1a9200b83d65976dbeedb164d6be7d4669b630436276654a096821b56, block 880,272
diff --git a/newsfragments/4163.other b/newsfragments/4163.other
new file mode 100644
index 000000000..e69de29bb