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

diff --git a/activities.mdwn b/activities.mdwn
index d8aa775..e42acbf 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,6 +5,13 @@ 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.
 
+### Upcoming events
+
+* [FOSDEM](http://fosdem.org/2010/),
+  February 6, 2010, at 15:20 CET.
+  At this event, I will give a lightning talk titled
+  ["tinc: the difficulties of a peer-to-peer VPN on the hostile Internet"](http://fosdem.org/2010/schedule/events/tinc).
+
 ### Past events
 
 * [Online tutorial](),
@@ -57,6 +64,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/),