X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=4e76fcdaea7f19df6e3aef0faedf75a4c3e0d34f;hb=b1e9900046ecf3b66c56b4bbed240f714b8bf4cc;hp=8d208bab7bb5bb1b132f2776b92f3b9bbb70b9bf;hpb=61e7aac92e9bb548176af1ed254c77d7e724e18b;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index 8d208ba..4e76fcd 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,18 +5,33 @@ 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
+
+* [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).
-* [FOSDEM](http://archive.fosdem.org/2011/),
+  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".
-* [FOSDEM](http://archive.fosdem.org/2010/),
+* [FOSDEM](https://archive.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://archive.fosdem.org/2010/schedule/events/tinc).
+  ["tinc: the difficulties of a peer-to-peer VPN on the hostile Internet"](https://archive.fosdem.org/2010/schedule/events/tinc.html).
   You can look at the [slides](/presentations/fosdem-2010/tinc_fosdem2010_slides.pdf).
 * [Online tutorial](),
   November 8, 2003,
@@ -35,7 +50,7 @@ not listed here, we would also like to hear about it.
   [abstract](/presentations/nluug-20010531/abstract).
   You can also download the
   [conference paper](/presentations/nluug-20010531/havpns.ps.gz) (Dutch only).
-* [Open Source Developers Europe Meeting](http://archive.fosdem.org/2001/),
+* [Open Source Developers Europe Meeting](https://archive.fosdem.org/2001/),
   February 3-4, 2001, Brussels, Belgium.  
   We were there, but unfortunately the official schedule was
   completely filled up. We did talk to some people in one of the
@@ -50,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.