From cb9351e7dea3179f22e4b006ff80763f563f041c Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Mon, 16 Nov 2015 00:54:35 +0100 Subject: [PATCH] Add news item about the FOSSETCON 2015 talk. --- activities.mdwn | 9 ++++----- news/fossetcon2015.mdwn | 5 +++++ 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 news/fossetcon2015.mdwn diff --git a/activities.mdwn b/activities.mdwn index 4332bcd..9e546c7 100644 --- a/activities.mdwn +++ b/activities.mdwn @@ -7,10 +7,10 @@ not listed here, we would also like to hear about it. ### Upcoming events -* [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. +* [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 @@ -18,7 +18,6 @@ not listed here, we would also like to hear about it. 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 were present in the [Milliways village](http://events.ccc.de/camp/2011/wiki/Milliways). diff --git a/news/fossetcon2015.mdwn b/news/fossetcon2015.mdwn new file mode 100644 index 0000000..5f972db --- /dev/null +++ b/news/fossetcon2015.mdwn @@ -0,0 +1,5 @@ +[[!meta author="guus"]] + +At [FOSSETCON 2015](http://www.fossetcon.org/2015/), which is held in Orland, +Florida on November 19-21, there will be a talk titled +[Secure peer networking with tinc](http://www.fossetcon.org/2015/sessions/secure-peer-networking-tinc). -- 2.20.1