Merge branch 'master' of github.com:jlopp/lopp.net

bitcoin-information/merchant-adoption.html

@@ -131,7 +131,6 @@ <h2 id="debit_cards"><a href="#debit_cards">Bitcoin Debit Cards:</a></h2>
         <div class="text-left col-xs-12 col-sm-6 col-lg-6 col-md-6">
           <h2 id="payments"><a href="#payments">Merchant Payment Processing:</a></h2>
           <ul>
-            <li><a href="https://bamotf.com/" title="bamotf" target="_blank" rel="noopener">bamotf</a> (payment processing toolkit)</li>
             <li><a href="https://btcpayserver.org/" title="BTCPay" target="_blank" rel="noopener">BTCPay</a> (be your own payment processor)</li>
             <li><a href="https://en.bitcoin.it/wiki/Category:Payment_Processors" title="Payment Processors" target="_blank" rel="noopener">Payment Processors List</a></li>
             <li><a href="https://github.com/alexk111/awesome-bitcoin-payment-processors" title="Payment Processors" target="_blank" rel="noopener">Payment Processors List 2</a></li>

bitcoin-information/podcasts.html

@@ -129,6 +129,7 @@ <h2 id="podcasts"><a href="#podcasts">Audio Podcasts:</a></h2>
             <li><a href="https://thebiz.pro/" title="Biz" target="_blank" rel="noopener">The Biz</a></li>
             <li><a href="https://www.bluecollarbitcoin.io/" title="Blue Collar Bitcoin" target="_blank" rel="noopener">Blue Collar Bitcoin</a></li>
             <li><a href="https://www.youtube.com/@buildersinbitcoin" title="Builders in Bitcoin" target="_blank" rel="noopener">Builders in Bitcoin</a></li>
+            <li><a href="https://www.builtonbitcoin.xyz/" title="Built on Bitcoin" target="_blank" rel="noopener">Built on Bitcoin</a></li>
             <li><a href="https://podcast.chaincode.com/" title="Chaincode" target="_blank" rel="noopener">Chaincode</a></li>
             <li><a href="https://www.podpage.com/citadeldispatch/" title="Citadel Dispatch" target="_blank" rel="noopener">Citadel Dispatch</a></li>
             <li><a href="https://citizenbitcoin.simplecast.com/" title="Citizen Bitcoin" target="_blank" rel="noopener">Citizen Bitcoin</a></li>

bitcoin-information/privacy.html

@@ -169,6 +169,7 @@ <h2 id="sim"><a href="#sim">Anonymous SIM / SMS:</a></h2>
             <li><a href="https://esimsdata.com/" title="eSimsData" target="_blank" rel="noopener">eSimsData</a></li>
             <li><a href="https://juicysms.com/" title="Juicy SMS" target="_blank" rel="noopener">Juicy SMS</a></li>
             <li><a href="https://www.lnesim.com/" title="LN Esim" target="_blank" rel="noopener">LN Esim</a></li>
+            <li><a href="https://sats2data.africa/" title="Sats2Data" target="_blank" rel="noopener">Sats2Data</a> (Africa)</li>
             <li><a href="https://silent.link/" title="Silent Link" target="_blank" rel="noopener">Silent Link</a></li>
             <li><a href="https://sms4sats.com/" title="SMS4Sats" target="_blank" rel="noopener">SMS 4 Sats</a></li>
             <li><a href="https://sms-activation-service.com/en/" title="SMS Service" target="_blank" rel="noopener">SMS Activation Service</a></li>

bitcoin-information/security.html

@@ -160,6 +160,14 @@ <h2 id="cold_storage"><a href="#cold_storage">Cold Storage Guides:</a></h2>
             <li><a href="https://github.com/fresheneesz/TordlWalletProtocols" title="Tordl" target="_blank" rel="noopener">Tordl Wallet Protocols</a></li>
           </ul>
         </div>
+        <div class="text-left col-xs-12 col-sm-6 col-lg-6 col-md-6">
+          <h2 id="disclosures"><a href="#disclosures">Bitcoin Security Disclosures:</a></h2>
+          <ul>
+            <li><a href="https://bitcoinmagazine.com/culture/bitmain-can-remotely-shut-down-your-antminer-and-everyone-elses" title="Antbleed" target="_blank" rel="noopener">Antbleed</a></li>
+            <li><a href="https://en.bitcoin.it/wiki/Common_Vulnerabilities_and_Exposures" title="CVEs" target="_blank" rel="noopener">Bitcoin CVEs</a></li>
+            <li><a href="https://darkskippy.com/" title="Dark Skippy" target="_blank" rel="noopener">Dark Skippy</a></li>
+          </ul>
+        </div>
         <div class="text-left col-xs-12 col-sm-6 col-lg-6 col-md-6">
           <h2 id="scams"><a href="#scams">Known Scams:</a></h2>
           <ul>

bitcoin-information/technical-resources.html

@@ -182,7 +182,6 @@ <h2 id="books"><a href="#books">Technical Books:</a></h2>
           <h2 id="academic"><a href="#academic">Academic Research:</a></h2>
           <ul>
             <li><a href="https://queue.acm.org/detail.cfm?id=3136559" title="Academic Pedigree" target="_blank" rel="noopener">Bitcoin's Academic Pedigree</a></li>
-            <li><a href="https://bitcoinproblems.org/" title="Research Problems" target="_blank" rel="noopener">Bitcoin Problems</a> (open research issues)</li>
             <li><a href="https://cdecker.github.io/btcresearch/" title="CABRA" target="_blank" rel="noopener">Comprehensive Academic Bitcoin Research Archive</a></li>
             <li><a href="https://cisaresearch.org/" title="CISA Research" target="_blank" rel="noopener">Cross Input Signature Aggregation Research</a></li>
             <li><a href="https://mitcryptocurrencyresearch.substack.com/" title="MIT Research" target="_blank" rel="noopener">MIT Cryptocurrency Research</a></li>