Merge remote branch 'origin/maint-0.2.2'

Resolved trivial one-line conflicts.

Conflicts:
	src/or/dirserv.c
	src/or/rephist.c

1 files changed, 6 insertions, 7 deletions

diff --git a/doc/HACKING b/doc/HACKING
index bdb86c06c..f42628b36 100644
--- a/doc/HACKING
+++ b/doc/HACKING
@@ -5,17 +5,17 @@ Getting started
 ---------------
 
 For full information on how Tor is supposed to work, look at the files in
-doc/spec/ .
+https://gitweb.torproject.org/torspec.git/tree
 
 For an explanation of how to change Tor's design to work differently, look at
-doc/spec/proposals/001-process.txt .
+https://gitweb.torproject.org/torspec.git/blob_plain/HEAD:/proposals/001-process.txt
 
 For the latest version of the code, get a copy of git, and
 
    git clone git://git.torproject.org/git/tor .
 
-We talk about Tor on the or-talk mailing list.  Design proposals and
-discussion belong on the or-dev mailing list.  We hang around on
+We talk about Tor on the tor-talk mailing list.  Design proposals and
+discussion belong on the tor-dev mailing list.  We hang around on
 irc.oftc.net, with general discussion happening on #tor and development
 happening on #tor-dev.
 
@@ -65,8 +65,8 @@ If at all possible, try to create this file in the same commit where
 you are making the change.  Please give it a distinctive name that no
 other branch will use for the lifetime of your change.
 
-When Roger goes to make a release, he will concatenate all the entries
-in changes to make a draft changelog, and clear the directory.  He'll
+When we go to make a release, we will concatenate all the entries
+in changes to make a draft changelog, and clear the directory. We'll
 then edit the draft changelog into a nice readable format.
 
 What needs a changes file?::
@@ -405,4 +405,3 @@ function should mention that it does that something in the documentation.  If
 you rely on a function doing something beyond what is in its documentation,
 then you should watch out, or it might do something else later.
 
-