Merge pull request #18 from engeld/master

replaced 30c3 with 31c3
This commit is contained in:
Pepi Zawodsky 2014-11-24 15:49:04 +01:00
commit 50935b5f81

View file

@ -62,18 +62,18 @@ You'll also find a list of all the nice humans who have contributed to this list
In case of an accident or other emergency condition carry a piece of information whom to contact or any special medical information that might be viable to your survival/first aid/medical staff.
#### Emergency Information for 30C3:
#### Emergency Information for 31C3:
If you're in an emergency shout HELP!
If you need help, just call for help, there are many, many people around to help you.
- 30C3 Medical Emergency or in case of fire: Call local DECT 112 (CERT)
- 30C3 Security: Call local DECT 110
- 30C3 organizers: 30c3-orga@cccv.de
- 31C3 Medical Emergency or in case of fire: Call local DECT 112 (CERT)
- 31C3 Security: Call local DECT 110
- 31C3 organizers: 31c3-orga@cccv.de
- local law enforcement in Hamburg: 110 or +49 40 4286 - 51410
- local sexual assault hotline in Hamburg: +49 40 - 255566 (http://www.frauennotruf-hamburg.de)
- Hamburg fire department: +49 40 42851-0 (BETTER USE 112 ON YOUR non-30C3 PHONE)
- Hamburg ambulance: +49 40 228022 (BETTER USE 112 ON YOUR non-30C3 PHONE)
- Hamburg fire department: +49 40 42851-0 (BETTER USE 112 ON YOUR non-31C3 PHONE)
- Hamburg ambulance: +49 40 228022 (BETTER USE 112 ON YOUR non-31C3 PHONE)
### Personal hygiene
@ -170,7 +170,7 @@ Your personal medication does not belong on the public interwebs for your privac
- 3* or 5* multi-plug power extension (230V≈ @50Hz) with [Schuko Plug][6] (and optional switch, hotel rooms usually suffer from severe lack of outlets)
- simple extension cord (230V @50Hz, [Schuko Plug][6], the power outlet in your hotel room may be far away from your bedside)
- USB flash drives
- Put an OWNER.txt file on them with information on how to contact you in case one gets lost accidentally. (Twitter, phone (for example DECT, 30C3 GSM extensions), email, name of the assembly you're well known at, owl, raven)
- Put an OWNER.txt file on them with information on how to contact you in case one gets lost accidentally. (Twitter, phone (for example DECT, 31C3 GSM extensions), email, name of the assembly you're well known at, owl, raven)
- For devices with private information be sure to encrypt them! (TrueCrypt, GPG, FileVault, EncFS, Bitlocker, gbde, geli, dm-crypt, LUKS, eCryptFS)
- make note of the filesystem used so you know if they will work on the system of the person you want to exchange data with. (FAT32 is a safe bet to work everywhere.)
- Mac: NTFS, ZFS, Ext can be read, but not written to without 3rd party software. FAT, ExFAT, HFS+(J), HFSX are fine for current OS X versions
@ -372,7 +372,7 @@ These people have contributed to improve this list for everyone (in no particula
[17]:http://code.kryo.se/iodine/ "iodine"
[18]:http://openssh.org/ "OpenSSH"
[19]:https://www.torproject.org/ "Tor Project"
[20]:https://events.ccc.de/congress/2013/Fahrplan/ "30C3 Fahrplan aka conference schedule"
[20]:https://events.ccc.de/congress/2014/Fahrplan/ "31C3 Fahrplan aka conference schedule"
[20]:https://play.google.com/store/apps/details?id=com.googlecode.droidwall.free
[21]:https://www.organspende-info.de