go.talks: use golang.org/s instead of tinyurl.com

R=r
CC=golang-dev
https://golang.org/cl/6678051
diff --git a/2012/chat.slide b/2012/chat.slide
index 6c996b1..97b2411 100644
--- a/2012/chat.slide
+++ b/2012/chat.slide
@@ -262,4 +262,4 @@
 
 "Go Concurrency Patterns" by Rob Pike:
 
-.link http://tinyurl.com/goconcurrent
+.link http://golang.org/s/concurrency-patterns
diff --git a/2012/concurrency.slide b/2012/concurrency.slide
index 35a5a51..4da9c8a 100644
--- a/2012/concurrency.slide
+++ b/2012/concurrency.slide
@@ -4,7 +4,7 @@
 
 Rob Pike
 Google
-http://tinyurl.com/plusrob
+http://golang.org/s/plusrob
 @rob_pike
 http://golang.org
 
@@ -48,7 +48,9 @@
 
 On the other hand, a well-written concurrent program might run efficiently in parallel on a multiprocessor. That property could be important...
 
-See tinyurl.com/goconcnotpar for more on that distinction. Too much to discuss here.
+For more on that distinction, see the link below. Too much to discuss here.
+
+.link http://golang.org/s/concurrency-is-not-parallelism
 
 * A model for software construction
 
@@ -398,19 +400,19 @@
 
 Chatroulette toy:
 
-.link http://tinyurl.com/gochatroulette
+.link http://golang.org/s/chat-roulette
 
 Load balancer:
 
-.link http://tinyurl.com/goloadbalancer
+.link http://golang.org/s/load-balancer
 
 Concurrent prime sieve:
 
-.link http://tinyurl.com/gosieve
+.link http://golang.org/s/prime-sieve
 
 Concurrent power series (by McIlroy):
 
-.link http://tinyurl.com/gopowerseries
+.link http://golang.org/s/power-series
 
 * Don't overdo it
 
@@ -458,4 +460,4 @@
 
 Concurrency is not parallelism:
 
-.link http://tinyurl.com/goconcnotpar
+.link http://golang.org/s/concurrency-is-not-parallelism
diff --git a/2012/go1.slide b/2012/go1.slide
index 1043f08..be0eb63 100644
--- a/2012/go1.slide
+++ b/2012/go1.slide
@@ -2,7 +2,7 @@
 
 Rob Pike
 Google
-http://tinyurl.com/plusrob
+http://golang.org/s/plusrob
 @rob_pike
 http://golang.org
 
@@ -499,7 +499,7 @@
 
 "Meet the Go team" panel from Google I/O 2012:
 
-.link http://tinyurl.com/meet-the-go-team
+.link http://golang.org/s/meet-the-go-team
 
 Google Code project: