X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=03ecef7a0909e5bc290216a2628f234b29baa217;hb=4c91a55df05e3badc91802bc9116c94efb339e49;hp=d8aa775391f88775c194f576dfa40dbc1bce2c1f;hpb=06df8a95f1f5e5572a42ed70b5b5249e488ac362;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index d8aa775..03ecef7 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -7,6 +7,12 @@ not listed here, we would also like to hear about it.
 
 ### Past events
 
+* [FOSDEM](http://fosdem.org/2010/),
+  February 6, 2010, at 15:20 CET.
+  At this event, Guus Sliepen gave a lightning talk titled
+  ["tinc: the difficulties of a peer-to-peer VPN on the hostile Internet"](http://fosdem.org/2010/schedule/events/tinc).
+  You can look at the [slides](/presentations/fosdem-2010/tinc_fosdem2010_slides.pdf).
+  A video of the talk will be available later.
 * [Online tutorial](),
   November 8, 2003,
   on [irc.debian.org #tinc]() at 18:00 GMT.  
@@ -57,6 +63,7 @@ References to tinc that can be found in other articles:
 
 * [c't magazin](http://www.heise.de/ct/), 2009, issue 19:
   *"[Maschen-VPN](http://www.heise.de/ct/inhalt/2009/19/176/)"* (German).
+  The full article can be read [online at heise.de](http://www.heise.de/netze/Dezentrales-VPN-mit-Tinc--/artikel/145795).
 * [Linux Magazin](http://www.linux-magazin.de), October 2003:
   *"[Einfache Verbindung: VPN-Daemon im Userspace: Tinc](http://www.linux-magazin.de/Heft-Abo/Ausgaben/2003/10/Einfache-Verbindung)"* (German).
 * [Building Linux Virtual Private Networks](http://www.buildinglinuxvpns.net/contents/),