X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=9e546c767993adb3ad32d30468b8d05ea8747fdb;hb=cb9351e7dea3179f22e4b006ff80763f563f041c;hp=799c148ed01b5c9df5bdabf8f0395ede1660530a;hpb=75c60f37436fcad69a3c5aeaf618c9d7078dc88e;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index 799c148..9e546c7 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,20 +5,22 @@ 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
 
-* [OHM2013](https://ohm2013.org/site/),
-  July 31-August 4, 2013, near Alkmaar, The Netherlands.
-  There will be a lightning talk about tinc in T2 at 15:55 on August 1, a talk about [ChaosVPN](http://wiki.hamburg.ccc.de/index.php/ChaosVPN) in T6 at 13:00 on August 1,
-  and combined workshop for tinc and ChaosVPN at the [Milliways village](https://ohm2013.org/wiki/Village:Milliways).
-
+* [FOSSETCON](http://www.fossetcon.org/2015),
+  November 19-21, 2015, at Hilton Lake Buena Vista, United States.
+  There is a talk titled [Secure peer networking with tinc](http://www.fossetcon.org/2015/sessions/secure-peer-networking-tinc)
+  in Palm 4 from 10:15 to 11:00.
 
 ### Past events
 
+* [OHM2013](https://ohm2013.org/site/),
+  July 31-August 4, 2013, near Alkmaar, The Netherlands.
+  There was a lightning talk about tinc ([slides](/presentations/OHM2013/The_tinc_VPN.pdf)) in T2 at 15:55 on August 1, a talk about [ChaosVPN](http://wiki.hamburg.ccc.de/index.php/ChaosVPN) in T6 at 13:00 on August 1,
+  and combined workshop for tinc and ChaosVPN at the [Milliways village](https://ohm2013.org/wiki/Village:Milliways).
 * [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).
+  We were present in the [Milliways village](http://events.ccc.de/camp/2011/wiki/Milliways).
 * [FOSDEM](https://archive.fosdem.org/2011/),
   February 5 and 6, 2011, in Brussels, Belgium.
   We were present as part of the devroom "New challenges in Virtualization".