X-Git-Url: https://tinc-vpn.org/git/browse?p=wiki;a=blobdiff_plain;f=activities.mdwn;h=4e76fcdaea7f19df6e3aef0faedf75a4c3e0d34f;hp=e75f1f88c2bca9bed45101b6d57bf4d12b69f524;hb=fa4c1b3599ae5192b205149a2b2f565c6cff6732;hpb=5d16c4058d5e939f39e8ca03e92b97f80a4ba392

diff --git a/activities.mdwn b/activities.mdwn
index e75f1f8..4e76fcd 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,18 +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.
-  We are present in 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)
+  on the 23rd from 11:30 to 12:30 in Ballroom F.
 
 ### Past events
 
-* [Chaos Communication Camp](http://events.ccc.de/camp/2011/),
+* [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](https://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](https://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".
@@ -57,7 +65,7 @@ not listed here, we would also like to hear about it.
   [slides](/presentations/linuxexpo-20010123/),
   or download the
   [presentation](/presentations/linuxexpo/slides.tgz).
-* [NLLGG](http://www.nllgg.nl/) meeting,
+* [NLLGG](https://www.nllgg.nl/) meeting,
   October 7th, 2000.  
   You can look at a copy of the
   [sheets](/presentations/nllgg/tp.ps.gz) we used.