X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=4218fbfe804c32ae4a4c8d12b77d7533f8858ffe;hb=506b1601731eb4cac35e5f516e20b312f0b51015;hp=799c148ed01b5c9df5bdabf8f0395ede1660530a;hpb=75c60f37436fcad69a3c5aeaf618c9d7078dc88e;p=wiki diff --git a/activities.mdwn b/activities.mdwn index 799c148..4218fbf 100644 --- a/activities.mdwn +++ b/activities.mdwn @@ -5,20 +5,16 @@ 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 * [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, + 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). - -### 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). + 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".