X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=142013f186b6c68bcfd9a1233f08520eb0c9890a;hb=01929033050a19b3325aa6a4421845cc41efe235;hp=e42acbf089b1d8cf26eaf26b0ded99f81d833df1;hpb=4654465ab110536478373086b4476379520dabe8;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index e42acbf..142013f 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -7,13 +7,20 @@ 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).
+* [Chaos Communication Camp](http://events.ccc.de/camp/2011/),
+  August 10-14, 2011, in Finowfurt, Germany.
+  We are present in the [Milliways village](http://events.ccc.de/camp/2011/wiki/Milliways).
 
 ### Past events
 
+* [FOSDEM](http://fosdem.org/2011/),
+  February 5 and 6, 2011, in Brussels, Belgium.
+  We were present as part of the devroom [New challenges in Virtualization](http://nciv2011.v2.cs.unibo.it/).
+* [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.