X-Git-Url: https://www.tinc-vpn.org/git/browse?p=wiki;a=blobdiff_plain;f=activities.mdwn;fp=activities.mdwn;h=0465a446d54f6712894ce4173e6e14f606ec8569;hp=4e76fcdaea7f19df6e3aef0faedf75a4c3e0d34f;hb=f41c345a154c1ef60b5ba700a01151a565722f55;hpb=4e7e0eaae0c736d4b275aed0372f704f3f90c8c2 diff --git a/activities.mdwn b/activities.mdwn index 4e76fcd..0465a44 100644 --- a/activities.mdwn +++ b/activities.mdwn @@ -5,15 +5,12 @@ 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 * [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 - * [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) @@ -81,6 +78,8 @@ Articles we have published: References to tinc that can be found in other articles and books: +* [LINUX Unplugged](https://linuxunplugged.com/), + podcast 329: *"[Flat Network Truthers](https://linuxunplugged.com/329)"*. * [Der eigene Server mit FreeBSD 9](http://serverzeit.de/das-buch), a book by Benedikt Nießen, published in 2012 by dpunkt.verlag GmbH, ISBN: 978-3-89864-814-1.