X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=activities.mdwn;h=4332bcddfa703f580059c55406575ba45ec32d95;hb=0c272b8753cc541d519fede87a5096234fab671e;hp=4218fbfe804c32ae4a4c8d12b77d7533f8858ffe;hpb=506b1601731eb4cac35e5f516e20b312f0b51015;p=wiki

diff --git a/activities.mdwn b/activities.mdwn
index 4218fbf..4332bcd 100644
--- a/activities.mdwn
+++ b/activities.mdwn
@@ -5,6 +5,13 @@ 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
+
+* [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
 
 * [OHM2013](https://ohm2013.org/site/),