diff --git a/ChangeLog b/ChangeLog
index d4f1ee0ab185fa5320ca1e49a9a6d5854fab5ed8..046eb4139fd44bd51968584f4d94453d991152ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 Changes in version 0.0.11 - UNRELEASED:
+ - Update my e-mail address.
 
 Changes in version 0.0.10 - 2019-04-12:
  - Disable behavior distinctive to crypto/tls when using utls.
diff --git a/LICENSE b/LICENSE
index 6b89f8cac15e98f5c262db8f1a66fa8d60f61ae9..34f1bd9417b6f7720eebf1afb296ec29bf494934 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/README.md b/README.md
index 332953841ea32c69212d4b129ff6bdfce1f1dd9c..621fe215f9fc699b9215d66dedc110b70463d6fa 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 ## obfs4 - The obfourscator
-#### Yawning Angel (yawning at torproject dot org)
+#### Yawning Angel (yawning at schwanenlied dot me)
 
 ### What?
 
diff --git a/common/csrand/csrand.go b/common/csrand/csrand.go
index 5dc617fd10a77bce81b87083c8c9715f9d4e4366..ddf14e8fcae0d6599cf5b2825edd7600c84e25cf 100644
--- a/common/csrand/csrand.go
+++ b/common/csrand/csrand.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/drbg/hash_drbg.go b/common/drbg/hash_drbg.go
index 3d1a46940e1442f806be1ad660d110a15169c6c2..5a9cc7f3d1dd7242143ab05409cc15c812c8f01c 100644
--- a/common/drbg/hash_drbg.go
+++ b/common/drbg/hash_drbg.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/log/log.go b/common/log/log.go
index 53dd9c6663e928274582218bdbfb989d33dd06dd..61d8d8c1b2e9b660f9d63f8cc8fae0fa1ebd8607 100644
--- a/common/log/log.go
+++ b/common/log/log.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014-2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/ntor/ntor.go b/common/ntor/ntor.go
index 48508bfe7059c311b6682f1ee92406c0a04a9e03..15f7f38d185d4b6b2e19dbd22a46c001fa737669 100644
--- a/common/ntor/ntor.go
+++ b/common/ntor/ntor.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/ntor/ntor_test.go b/common/ntor/ntor_test.go
index c92c04e646a2911e7b8e68a33c6bc2ccb6fa6215..e4d1543bdfab13c94b49e3ecaa4b3f6583ee001b 100644
--- a/common/ntor/ntor_test.go
+++ b/common/ntor/ntor_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/probdist/weighted_dist.go b/common/probdist/weighted_dist.go
index 66c4f7b71d17f0a3f2d6441b322b028788de5f08..d0d380cbb02a0e905dec6d678dd4751987d3235e 100644
--- a/common/probdist/weighted_dist.go
+++ b/common/probdist/weighted_dist.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/probdist/weighted_dist_test.go b/common/probdist/weighted_dist_test.go
index 5bbcc323b2397f23d85353b1a1234f229ebb34fb..4619212c1c57e76b6847a1e248bac0c6cf7a50ae 100644
--- a/common/probdist/weighted_dist_test.go
+++ b/common/probdist/weighted_dist_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/replayfilter/replay_filter.go b/common/replayfilter/replay_filter.go
index f3b2bd09f0014827ef77385a6e54cd4f2a68415e..00ee3e9e464f3a3cbfd9cf40509d9cc90ac5144a 100644
--- a/common/replayfilter/replay_filter.go
+++ b/common/replayfilter/replay_filter.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/replayfilter/replay_filter_test.go b/common/replayfilter/replay_filter_test.go
index 884e4fba573f054607e0d48a2698bdafbfcf538b..b8ab094708d2ef507b105c7bebd4d63911d14d62 100644
--- a/common/replayfilter/replay_filter_test.go
+++ b/common/replayfilter/replay_filter_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/socks5/args.go b/common/socks5/args.go
index d9ea0992007bdbb90c99eea1059489657d2a724b..a5efb43577531fedd4f2c676fd300b5c61b87d6f 100644
--- a/common/socks5/args.go
+++ b/common/socks5/args.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/socks5/rfc1929.go b/common/socks5/rfc1929.go
index d7849df0cff60ec0a0f25f4429ba9f34996e57fc..93a2c16dfcac4f85e866ac1f7db2961dd3e430ae 100644
--- a/common/socks5/rfc1929.go
+++ b/common/socks5/rfc1929.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/socks5/socks5.go b/common/socks5/socks5.go
index a6f785dff7241cb01b1a8fd4471483e686d9c5ce..7630d3d712b151c35b418a84597d80d8976eff61 100644
--- a/common/socks5/socks5.go
+++ b/common/socks5/socks5.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/socks5/socks_test.go b/common/socks5/socks_test.go
index 3e331fb5bd69243721ff929d151b7c1bd58bc81b..ace7fd32a0d1f15ff094c2630a93d3620b0dac92 100644
--- a/common/socks5/socks_test.go
+++ b/common/socks5/socks_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/uniformdh/uniformdh.go b/common/uniformdh/uniformdh.go
index bcd25fccaeb2b5cbcc379847a8deae02f7c64e43..1d500a332223304fd66283a717a9b71770f7a732 100644
--- a/common/uniformdh/uniformdh.go
+++ b/common/uniformdh/uniformdh.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/common/uniformdh/uniformdh_test.go b/common/uniformdh/uniformdh_test.go
index d705d6665a03eda9fc201aa9fc270da8ceea4ef2..326293b1e05dcc7aa1e0974f6346abe1448956ad 100644
--- a/common/uniformdh/uniformdh_test.go
+++ b/common/uniformdh/uniformdh_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index c89992884ab0e4b07894c3c4add522c5ff97fb0b..3efc41ed24c7f2bb4de042e9fcdf80e71816f7b5 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014-2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/proxy_http.go b/obfs4proxy/proxy_http.go
index 181e79d1465c00453460729645ecda9ce23e6594..1adadf868e5f2ddc0b5734e4f772a2473b6a8199 100644
--- a/obfs4proxy/proxy_http.go
+++ b/obfs4proxy/proxy_http.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/proxy_socks4.go b/obfs4proxy/proxy_socks4.go
index 536dd9651aa5221c9e7b6361c63771c7930d5e3b..ac8be9e2bff5eddf6fbd77268506d7d409209d18 100644
--- a/obfs4proxy/proxy_socks4.go
+++ b/obfs4proxy/proxy_socks4.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/pt_extras.go b/obfs4proxy/pt_extras.go
index dfe6d0f36232abfbee59e7daff9f599551b41d2b..18bc2df708f37e9daf003dfa0d66e4a03ca08ba0 100644
--- a/obfs4proxy/pt_extras.go
+++ b/obfs4proxy/pt_extras.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/termmon.go b/obfs4proxy/termmon.go
index d402716a505b756755b7d22993ab649133a89cdf..59304c9d84ce550a56cde36d2df09c4425127f09 100644
--- a/obfs4proxy/termmon.go
+++ b/obfs4proxy/termmon.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/obfs4proxy/termmon_linux.go b/obfs4proxy/termmon_linux.go
index 9711cfc7cdf7770d1241f903e9d27eda99c8137a..926e6309c5b4aa25ef04cf170e294f262b2d18f5 100644
--- a/obfs4proxy/termmon_linux.go
+++ b/obfs4proxy/termmon_linux.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/base/base.go b/transports/base/base.go
index de5192957e9653fe2bf0d014ee6346d3c752e824..bc6e0257b1a59a774f59a2ab8e40dcbe987ac9dd 100644
--- a/transports/base/base.go
+++ b/transports/base/base.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/meeklite/base.go b/transports/meeklite/base.go
index a173996d7601bf2003d3b604164ce65b9ab85f75..399ff4c94baaa24df555c4a767edd6501d9c29da 100644
--- a/transports/meeklite/base.go
+++ b/transports/meeklite/base.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/meeklite/meek.go b/transports/meeklite/meek.go
index fc97d7f22df52b440dd77b212802e87b10161958..367563b19a132890ffb400a81d6d7bc440098272 100644
--- a/transports/meeklite/meek.go
+++ b/transports/meeklite/meek.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go
index 7eaaa96597314c924acbb84f83149eed9b39700e..531bcd4297b573d755901c1976542b2b121aafe9 100644
--- a/transports/obfs2/obfs2.go
+++ b/transports/obfs2/obfs2.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go
index 26b4728967cdc205dafdf10939eec59581da5747..42bdd90d2c849d03a9756402a81ed6c9b16326de 100644
--- a/transports/obfs3/obfs3.go
+++ b/transports/obfs3/obfs3.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/framing/framing.go b/transports/obfs4/framing/framing.go
index f0c38c31eae000f09abd3a143d2d75d34e897a0e..10604a988b54235d1b12938f2be272d0de3069c7 100644
--- a/transports/obfs4/framing/framing.go
+++ b/transports/obfs4/framing/framing.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/framing/framing_test.go b/transports/obfs4/framing/framing_test.go
index f34a3a6ec97e4fd91a945814ef3a2b39161cf118..d83062504cd5160fc68e8d989e2eabbe1eb8cf7c 100644
--- a/transports/obfs4/framing/framing_test.go
+++ b/transports/obfs4/framing/framing_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/handshake_ntor.go b/transports/obfs4/handshake_ntor.go
index 6629c46a96d4a2d6f064fb59c1c909dc6e91f50e..c5d0e6c5ac62608df3b3bc5c1084746f372ae7e6 100644
--- a/transports/obfs4/handshake_ntor.go
+++ b/transports/obfs4/handshake_ntor.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/handshake_ntor_test.go b/transports/obfs4/handshake_ntor_test.go
index 8e4d260fcec8e32384bc34997153c7bef50ee2da..701c6104282dc6184156dc3bf846a6dc5a33d91e 100644
--- a/transports/obfs4/handshake_ntor_test.go
+++ b/transports/obfs4/handshake_ntor_test.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/obfs4.go b/transports/obfs4/obfs4.go
index 6a92f17f861a22c9ba8a9c7ff0889e8ea0b0a21d..0182a2c4b87dc64ef647b3cc930176712ecef92a 100644
--- a/transports/obfs4/obfs4.go
+++ b/transports/obfs4/obfs4.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/packet.go b/transports/obfs4/packet.go
index 653fae3b97b129452fa529bd43dcff35e98dc011..8d47af9609a5e26338c0947a74215228ab42f426 100644
--- a/transports/obfs4/packet.go
+++ b/transports/obfs4/packet.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/obfs4/statefile.go b/transports/obfs4/statefile.go
index 8752f0d9cc2012087d3341b7c618a7c7c93d647f..cbf1d6ee512d291749019e39800b56e93504aca7 100644
--- a/transports/obfs4/statefile.go
+++ b/transports/obfs4/statefile.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/base.go b/transports/scramblesuit/base.go
index 5817ee633cbe4766832bb9738e3b1113ed19362d..655ad7af9c35710274cd8fd4b7e094daa9f6bc77 100644
--- a/transports/scramblesuit/base.go
+++ b/transports/scramblesuit/base.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/conn.go b/transports/scramblesuit/conn.go
index 715d20a6c760156643fd97382a3fd5840351b692..cc18e184bfa348aea4a620ff38777e6a18a327ef 100644
--- a/transports/scramblesuit/conn.go
+++ b/transports/scramblesuit/conn.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/handshake_ticket.go b/transports/scramblesuit/handshake_ticket.go
index 9672e1b7abb153a856e4ebb5b199c29114bf259c..f415be00910c376cfe51721f2564c683ec5a6ad2 100644
--- a/transports/scramblesuit/handshake_ticket.go
+++ b/transports/scramblesuit/handshake_ticket.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/handshake_uniformdh.go b/transports/scramblesuit/handshake_uniformdh.go
index 5a79d6450e22f17d028f90bfb59e0b40f30fcada..107bc9843cea28724137a5c6b06d3d65b207b84e 100644
--- a/transports/scramblesuit/handshake_uniformdh.go
+++ b/transports/scramblesuit/handshake_uniformdh.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/scramblesuit/hkdf_expand.go b/transports/scramblesuit/hkdf_expand.go
index 5f4f4b48c271dd3e01633a28323b320ada8eab88..cbdcbb31d9b498e5876a02719ed01127028c6017 100644
--- a/transports/scramblesuit/hkdf_expand.go
+++ b/transports/scramblesuit/hkdf_expand.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2015, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/transports/transports.go b/transports/transports.go
index 921666a9ca4970675bf3a4d9d96a6a96ffab81a4..2e83688524b46603c17854f4c91d307e2fb636f6 100644
--- a/transports/transports.go
+++ b/transports/transports.go
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Yawning Angel <yawning at torproject dot org>
+ * Copyright (c) 2014, Yawning Angel <yawning at schwanenlied dot me>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without