X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=0f528259d83d6862155c4fc5a7003c0b75690b7a;hb=188065264e9ae875d439c84cdf128dd17c379bad;hp=e42acbf089b1d8cf26eaf26b0ded99f81d833df1;hpb=4654465ab110536478373086b4476379520dabe8;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index e42acbf..0f52825 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,15 +5,19 @@ 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
+### Past events
 
+* [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).
+* [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, I will give a lightning talk titled
+  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).
-
-### Past events
-
+  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.