Merge remote-tracking branch 'origin/maint-0.2.2'

doc/HACKING

@@ -475,12 +475,10 @@ and push the git tag.
    (That's either "git tag -u <keyid> tor-0.2.x.y-status", then
     "git push origin tag tor-0.2.x.y-status".  To sign the
     tarball, "gpg -ba <the_tarball>".  Put the files in
-    /src/www-master.torproject.org/htdocs/dist on vescum, then
-    sudo -u mirroradm -H /home/mirroradm/bin/trigger-mirrors sudoed
-    )
+    /srv/www-master.torproject.org/htdocs/dist/ on vescum.)
 
-8) Edit include/versions.wmi to note the new version. Rebuild and push
-the website.
+8) Edit include/versions.wmi to note the new version. From your website
+checkout, run ./publish to build and publish the website.
 
 9) Email Erinn and weasel (cc'ing tor-assistants) that a new tarball
 is up. This step should probably change to mailing more packagers.

src/common/compat.c

@@ -2163,7 +2163,6 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf,
   return r;
 }
 
-
 /** @{ */
 /** As localtime_r, but defined for platforms that don't have it:
  *

src/or/rendclient.c

@@ -278,7 +278,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
   introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT;
 
   return 0;
-perm_err:
+ perm_err:
   if (!introcirc->_base.marked_for_close)
     circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL);
   circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL);