===================================================================
RCS file: /cvsrepo/anoncvs/cvs/www/hackathons.html,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -r1.171 -r1.172
--- www/hackathons.html	2023/05/11 20:51:04	1.171
+++ www/hackathons.html	2023/07/02 05:32:36	1.172
@@ -86,6 +86,15 @@
 
 <table>
 <td>
+    <a id="g2k23" href="images/hackathons/noshirt-s.gif">
+    <img src="images/hackathons/noshirt-s.gif" alt="noshirt-s"></a><br>
+    g2k23: general hackathon<br>
+    July 2 - 9, 2023<br>
+    Tallinn, Estonia<br>
+    20 developers<br>
+    Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+    <br>
+<td>
     <a id="w2k23" href="images/hackathons/w2k23.gif">
     <img src="images/hackathons/w2k23-s.gif" alt="w2k23"></a><br>
     w2k23: wifi nano hackathon<br>
@@ -103,6 +112,7 @@
     Marrakech, Morocco<br>
     22 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+<tr>
 <td>
     <br><br><br>
     <a id="h2k22" href="images/hackathons/h2k22.gif">
@@ -114,7 +124,6 @@
     22 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">OpenBSD Foundation</a>
     and with the support of Pedro Almeida.
-<tr>
 <td>
     <a id="g2k22" href="images/hackathons/g2k22.gif">
     <img src="images/hackathons/g2k22-s.gif" alt="g2k22"></a><br>
@@ -134,6 +143,7 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Stefan Sperling.
     <br>
+<tr>
 <td>
     <a id="h2k21" href="images/hackathons/h2k21.gif">
     <img src="images/hackathons/h2k21-s.gif" alt="h2k21"></a><br>
@@ -145,7 +155,6 @@
     and with the support of Pedro Almeida and the
     <a href="https://www.cm-gouveia.pt/">Municipality of Gouveia</a>.
     <br>
-<tr>
 <td>
     <a id="k2k21" href="images/hackathons/k2k21.gif">
     <img src="images/hackathons/k2k21-s.gif" alt="k2k21"></a><br>
@@ -162,6 +171,7 @@
     Burg Liebenzell, Germany<br>
     14 developers<br>
     Funded by <a href="http://www.genua.de">genua</a>.
+<tr>
 <td>
     <a id="a2k20" href="images/hackathons/a2k20.png">
     <img src="images/hackathons/a2k20-s.png" alt="a2k20"></a><br>
@@ -171,7 +181,6 @@
     17 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Ross L Richardson.
-<tr>
 <td>
     <a id="u2k20" href="images/hackathons/u2k20.gif">
     <img src="images/hackathons/u2k20-s.gif" alt="u2k20-s"></a><br>
@@ -190,6 +199,7 @@
     13 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.xplornet.ca">Xplornet</a>.
+<tr>
 <td>
     <a id="p2k19" href="images/hackathons/p2k19.gif">
     <img src="images/hackathons/p2k19-s.gif" alt="p2k19-s"></a><br>
@@ -201,7 +211,6 @@
     and supported by <a href="http://fmi.unibuc.ro">Faculty of Mathematics and
     Computer Science, University of Bucharest</a>.
     <br>
-<tr>
 <td>
     <a id="g2k19" href="images/hackathons/g2k19.gif">
     <img src="images/hackathons/g2k19-s.gif" alt="g2k19-s"></a><br>
@@ -221,6 +230,7 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Kevin Lo and <a href="http://www.funtoro.com">MSI/FUNTORO</a>
     <br>
+<tr>
 <td>
     <a id="a2k19" href="images/hackathons/a2k19.gif">
     <img src="images/hackathons/a2k19-s.gif" alt="a2k19-s"></a><br>
@@ -231,7 +241,6 @@
     Supported by the <a href="https://www.victoria.ac.nz">Victoria University of Wellington</a>
     and funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
     <br>
-<tr>
 <td>
     <a id="l2k18" href="images/hackathons/l2k18.jpg">
     <img src="images/hackathons/l2k18-s.gif" alt="l2k18-s"></a><br>
@@ -251,6 +260,7 @@
     Supported by Univerzita Jana Evangelisty Purkyn&#283; and
     funded by Oracle and
     <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+<tr>
 <td>
     <a id="g2k18" href="images/hackathons/g2k18.gif">
     <img src="images/hackathons/g2k18-s.gif" alt="g2k18-s"></a><br>
@@ -260,7 +270,6 @@
     39 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Mitja Mu&#382;eni&#269;.
-<tr>
 <td>
     <a id="p2k18" href="images/hackathons/p2k18.gif">
     <img src="images/hackathons/p2k18-s.gif" alt="p2k18-s"></a><br>
@@ -279,6 +288,7 @@
     19 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.otago.ac.nz">University of Otago</a>.
+<tr>
 <td>
     <a id="s2k17" href="images/hackathons/s2k17.gif">
     <img src="images/hackathons/s2k17-s.gif" alt="s2k17-s"></a><br>
@@ -288,7 +298,6 @@
     10 developers<br>
     Funded by <a href="http://www.foretell.ca">ForeTell Technologies</a>
     and with the support of <a href="http://www.xplornet.ca">Xplornet</a>.
-<tr>
 <td>
     <a id="p2k17" href="images/hackathons/p2k17.gif">
     <img src="images/hackathons/p2k17-s.gif" alt="p2k17-s"></a><br>
@@ -308,6 +317,7 @@
     38 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.utoronto.ca">University of Toronto</a>.
+<tr>
 <td>
     <a id="d2k17" href="images/hackathons/d2k17.gif">
     <img src="images/hackathons/d2k17-s.gif" alt="d2k17-s"></a><br>
@@ -317,7 +327,6 @@
     24 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.genua.de">genua</a>.
-<tr>
 <td>
     <a id="noshirt" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif" alt="noshirt-s"></a><br>
@@ -335,6 +344,7 @@
     19 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of David Gwynne.
+<tr>
 <td>
     <br>
     <br>
@@ -356,7 +366,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     with the help of <a href="http://www.enseeiht.fr">ENSEEIHT</a> and
     <a href="http://www.objectif-libre.com">Objectif Libre</a>.
-<tr>
 <td>
     <a id="b2k16" href="images/hackathons/b2k16.gif">
     <img src="images/hackathons/b2k16-s.gif" alt="b2k16-s"></a><br>
@@ -375,6 +384,7 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     with the help of
     <a href="http://www.cl.cam.ac.uk">Computer Laboratory, Cambridge</a>.
+<tr>
 <td>
     <a id="n2k16" href="images/hackathons/n2k16.gif">
     <img src="images/hackathons/n2k16-s.gif" alt="n2k16-s"></a><br>
@@ -385,7 +395,6 @@
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and <a href="http://www.oracle.com">Oracle</a>, with the help of
     <a href="http://cuni.cz">Charles University</a>.
-<tr>
 <td>
     <a id="p2k16" href="images/hackathons/p2k16.gif">
     <img src="images/hackathons/p2k16-s.gif" alt="p2k16-s"></a><br>
@@ -404,6 +413,7 @@
     19 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://esdenera.com">Esdenera Networks</a>.
+<tr>
 <td>
     <a id="u2k15" href="images/hackathons/u2k15.gif">
     <img src="images/hackathons/u2k15-s.gif" alt="u2k15-s"></a><br>
@@ -413,7 +423,6 @@
     22 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
-<tr>
 <td>
     <a id="l2k15" href="images/hackathons/l2k15.gif">
     <img src="images/hackathons/l2k15-s.gif" alt="l2k15-s"></a><br>
@@ -431,6 +440,7 @@
     Nasu, Tochigi, Japan<br>
     6 developers<br>
     With the support of <a href="http://www.iij-ii.co.jp/en/">IIJ innovation institute</a>.
+<tr>
 <td>
     <a id="c2k15" href="images/hackathons/c2k15.gif">
     <img src="images/hackathons/c2k15-s.gif" alt="c2k15-s"></a><br>
@@ -440,7 +450,6 @@
     45 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://sait.ca">SAIT</a>.
-<tr>
 <td>
     <a id="p2k15" href="images/hackathons/p2k15.gif">
     <img src="images/hackathons/p2k15-s.gif" alt="p2k15-s"></a><br>
@@ -459,6 +468,7 @@
     21 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of David Gwynne.
+<tr>
 <td>
     <a id="g2k14" href="images/hackathons/g2k14.gif">
     <img src="images/hackathons/g2k14-s.gif" alt="g2k14-s"></a><br>
@@ -468,7 +478,6 @@
     49 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of Mitja Mu&#382;eni&#269;.
-<tr>
 <td>
     <a id="m2k14" href="images/hackathons/m2k14.gif">
     <img src="images/hackathons/m2k14-s.gif" alt="m2k14-s"></a><br>
@@ -487,6 +496,7 @@
     15 developers<br>
     Funded by <a href="http://www.foretell.ca">ForeTell Technologies</a>
     and with the support of <a href="http://www.otago.ac.nz">University of Otago</a>.
+<tr>
 <td>
     <a id="b2k13" href="images/hackathons/b2k13.gif">
     <img src="images/hackathons/b2k13-s.gif" alt="b2k13-s"></a><br>
@@ -496,7 +506,6 @@
     21 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.in-berlin.de">IN-Berlin</a>.
-<tr>
 <td>
     <a id="t2k13" href="images/hackathons/t2k13.jpg">
     <img src="images/hackathons/t2k13-s.gif" alt="t2k13-s"></a><br>
@@ -515,6 +524,7 @@
     17 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.otago.ac.nz">University of Otago</a>.
+<tr>
 <td>
     <a id="c2k12" href="images/hackathons/c2k12.gif">
     <img src="images/hackathons/c2k12-s.gif" alt="c2k12-s"></a><br>
@@ -524,7 +534,6 @@
     10 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
-<tr>
 <td>
     <a id="p2k12" href="images/hackathons/p2k12.gif">
     <img src="images/hackathons/p2k12-s.gif" alt="p2k12-s"></a><br>
@@ -542,6 +551,7 @@
     Starnberg, Germany<br>
     23 developers<br>
     Funded by <a href="http://www.genua.de">genua</a>.
+<tr>
 <td>
     <a id="g2k12" href="images/hackathons/g2k12.gif">
     <img src="images/hackathons/g2k12-s.gif" alt="g2k12-s"></a><br>
@@ -550,7 +560,6 @@
     Budapest, Hungary<br>
     41 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
-<tr>
 <td>
     <a id="r2k12" href="images/hackathons/r2k12.gif">
     <img src="images/hackathons/r2k12-s.gif" alt="r2k12-s"></a><br>
@@ -570,6 +579,7 @@
     15 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
+<tr>
 <td>
     <a id="a2k11" href="images/hackathons/a2k11.gif">
     <img src="images/hackathons/a2k11-s.gif" alt="a2k11-s"></a><br>
@@ -579,7 +589,6 @@
     8 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
-<tr>
 <td>
     <a id="s2k11" href="images/hackathons/s2k11.jpg">
     <img src="images/hackathons/s2k11-s.gif" alt="s2k11-s"></a><br>
@@ -597,6 +606,7 @@
     Edmonton, Alberta, Canada<br>
     36 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
+<tr>
 <td>
     <a id="k2k11" href="images/hackathons/k2k11.jpg">
     <img src="images/hackathons/k2k11-s.gif" alt="k2k11-s"></a><br>
@@ -605,7 +615,6 @@
     Hafnarfjordur, Iceland<br>
     15 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
-<tr>
 <td>
     <a id="p2k10" href="images/hackathons/p2k10.gif">
     <img src="images/hackathons/p2k10-s.gif" alt="p2k10-s"></a><br>
@@ -622,6 +631,7 @@
     Sep 19 - 25, 2010<br>
     Akiyamago, Sakae Mura, Nagano, Japan<br>
     19 developers<br>
+<tr>
 <td>
     <a id="c2k10" href="images/hackathons/c2k10.gif">
     <img src="images/hackathons/c2k10-s.gif" alt="c2k10-s"></a><br>
@@ -630,7 +640,6 @@
     Edmonton, Alberta, Canada<br>
     46 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
-<tr>
 <td>
     <br>
     <br>
@@ -658,6 +667,7 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
+<tr>
 <td>
     <a id="p2k9" href="images/hackathons/p2k9.gif">
     <img src="images/hackathons/p2k9-s.gif" alt="p2k9-s"></a><br>
@@ -667,7 +677,6 @@
     14 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="f2k9" href="images/hackathons/f2k9.gif">
     <img src="images/hackathons/f2k9-s.gif" alt="f2k9-s"></a><br>
@@ -685,6 +694,7 @@
     46 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
+<tr>
 <td>
     <a id="n2k9" href="images/hackathons/n2k9.gif">
     <img src="images/hackathons/n2k9-s.gif" alt="n2k9-s"></a><br>
@@ -692,7 +702,6 @@
     Jan 26 - 30, 2009<br>
     Basel, Switzerland<br>
     19 developers<br>
-<tr>
 <td>
     <a id="h2k8" href="images/hackathons/h2k8.gif">
     <img src="images/hackathons/h2k8-s.gif" alt="h2k8-s"></a><br>
@@ -712,6 +721,7 @@
     13 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
+<tr>
 <td>
     <a id="c2k8" href="images/hackathons/c2k8.gif">
     <img src="images/hackathons/c2k8-s.gif" alt="c2k8-s"></a><br>
@@ -720,7 +730,6 @@
     Edmonton, Alberta, Canada<br>
     55 developers<br>
     Funded by <a href="https://www.openbsdfoundation.org">The OpenBSD Foundation</a>.
-<tr>
 <td>
     <a id="n2k8" href="images/hackathons/n2k8.gif">
     <img src="images/hackathons/n2k8-s.gif" alt="n2k8-s"></a><br>
@@ -740,6 +749,7 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
+<tr>
 <td>
     <a id="p2k7" href="images/hackathons/p2k7.gif">
     <img src="images/hackathons/p2k7-s.gif" alt="p2k7-s"></a><br>
@@ -749,7 +759,6 @@
     13 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="c2k7" href="images/hackathons/c2k7.gif">
     <img src="images/hackathons/c2k7-s.gif" alt="c2k7-s"></a><br>
@@ -768,6 +777,7 @@
     14 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
+<tr>
 <td>
     <a id="h2k6" href="images/hackathons/h2k6.gif">
     <img src="images/hackathons/h2k6-s.gif" alt="h2k6-s"></a><br>
@@ -778,7 +788,6 @@
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>
     and with the support of <a href="http://www.uc.pt">University of Coimbra</a>.
-<tr>
 <td>
     <a id="p2k6" href="images/hackathons/p2k6.gif">
     <img src="images/hackathons/p2k6-s.gif" alt="p2k6-s"></a><br>
@@ -795,6 +804,7 @@
     Aug 28 - Sep 1, 2006<br>
     Schloss Kransberg, Germany<br>
     14 developers<br>
+<tr>
 <td>
     <a id="r2k6" href="images/hackathons/r2k6.gif">
     <img src="images/hackathons/r2k6-s.gif" alt="r2k6-s"></a><br>
@@ -803,7 +813,6 @@
     Hamburg, Germany<br>
     6 developers<br>
     Support of Henning Brauer.
-<tr>
 <td>
     <a id="c2k6" href="images/hackathons/c2k6.gif">
     <img src="images/hackathons/c2k6-s.gif" alt="c2k6-s"></a><br>
@@ -822,6 +831,7 @@
     12 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
+<tr>
 <td>
     <a id="c2k5" href="images/hackathons/c2k5.gif">
     <img src="images/hackathons/c2k5-s.gif" alt="c2k5-s"></a><br>
@@ -831,7 +841,6 @@
     60 developers<br>
     Funded by <a href="donations.html">donations to
     the OpenBSD Project</a>.
-<tr>
 <td>
     <a id="c2k4" href="images/hackathons/c2k4.gif">
     <img src="images/hackathons/c2k4-s.gif" alt="c2k4-s"></a><br>
@@ -849,6 +858,7 @@
     Sechelt, BC, Canada<br>
     12 developers<br>
     Support of Ryan McBride.
+<tr>
 <td>
     <a id="c2k3" href="images/hackathons/c2k3.gif">
     <img src="images/hackathons/c2k3-s.gif" alt="c2k3-s"></a><br>
@@ -858,7 +868,6 @@
     51 developers<br>
     Funded by <a href="https://www.nlnetlabs.nl">NLnet</a>
     (after DARPA pulled out their support).
-<tr>
 <td>
     <a id="c2k2" href="images/hackathons/c2k2.gif">
     <img src="images/hackathons/c2k2-s.gif" alt="c2k2-s"></a><br>
@@ -874,6 +883,7 @@
     Aug 17 - 20, 2001<br>
     Washington, DC<br>
     Funded by DARPA with support of <a href="http://www.usenix.org">USENIX</a>.
+<tr>
 <td>
     <a id="c2k1" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif" alt="noshirt-s"></a><br>
@@ -882,7 +892,6 @@
     Cambridge, Massachusetts<br>
     25 developers<br>
     Funded by DARPA with the support of <a href="http://www.mit.edu">MIT</a>.
-<tr>
 <td>
     <a id="c2k" href="images/hackathons/noshirt-s.gif">
     <img src="images/hackathons/noshirt-s.gif" alt="noshirt-s"></a><br>