X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=8074277ca20fa0e29d262dfb4a436cb1ca228f4c;hb=96fb70cb5ebb5338d90d3d2d97405e5468efa71f;hp=ec78d90d21f0d155457a03cf3ea97f7732b3f1ec;hpb=69648efbfa94e18988ba86a0dac9a5dfdeb0dbe1;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index ec78d90..8074277 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,20 +5,26 @@ 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, and a workshop setting up VPNs with tinc at
-  the [Milliways village](https://ohm2013.org/wiki/Village:Milliways).
-
+* [SCALE 14x](https://www.socallinuxexpo.org/scale/14x),
+  January 21-24, 2016, in the Pasedana Convention Center, California, United States.
+  There is a talk titled [Secure Mesh VPN w/ Service Discovery](https://www.socallinuxexpo.org/scale/14x/presentations/secure-mesh-vpn-w-service-discovery)
+  in Ballroom F from 11:30 to 12:30.
 
 ### Past events
 
+* [FOSSETCON](http://www.fossetcon.org/2015),
+  November 19-21, 2015, at Hilton Lake Buena Vista, United States.
+  There was 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.
+* [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".