X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=30a96dcff6fd1f7742fa252485bd8c5ea5d91a86;hb=7b078a9002bcc98df8023569f72fb01334299d08;hp=d8aa775391f88775c194f576dfa40dbc1bce2c1f;hpb=06df8a95f1f5e5572a42ed70b5b5249e488ac362;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index d8aa775..30a96dc 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,8 +5,18 @@ you are holding a meeting or writing an article about VPNs and also
 mention tinc, please [[tell us|contact]]. If you know of any we have
 not listed here, we would also like to hear about it.
 
+* [FOSDEM](http://fosdem.org/2011/),
+  February 5 and 6, 2011, in Brussels, Belgium.
+  We will be present as part of the devroom [New challenges in Virtualization](http://nciv2011.v2.cs.unibo.it/).
+  You are welcome to come by and discuss tinc, VPNs and other virtualization issues here.
+
 ### 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).
 * [Online tutorial](),
   November 8, 2003,
   on [irc.debian.org #tinc]() at 18:00 GMT.  
@@ -57,6 +67,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/),