summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsajolida <sajolida@pimienta.org>2015-09-16 11:27:35 +0000
committersajolida <sajolida@pimienta.org>2015-09-16 11:27:35 +0000
commitdb61369cf710aec270becbd5ab46a72c82b074c3 (patch)
tree7bc13e2a3055a001f13faa7a6dc2b70d333c9d25
parent06d46790abb326d7ee51f77ad9afdec8d7aa0f38 (diff)
Add Tor dev meeting
-rw-r--r--wiki/src/contribute/calendar.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/wiki/src/contribute/calendar.mdwn b/wiki/src/contribute/calendar.mdwn
index 621851d..7c7eb86 100644
--- a/wiki/src/contribute/calendar.mdwn
+++ b/wiki/src/contribute/calendar.mdwn
@@ -9,6 +9,8 @@
* 2015-09-22: [Tails - Computer nutzen und Privatsphäre schützen](http://pentabarf.linkemedienakademie.de/export/lima15_2/events/158.de.html)
by Vera Henssler and Ulrich Overdieck in Berlin, Germany (in German)
+* 2015-09-27 to 2015-10-02: Tor developers meeting in Berlin
+
* 2015-09-29 to 2015-10-02: Farsi localization sprint in Amsterdam
* 2015-10-06 to 08: OTF Annual Summit in Washington DC