From be7e8f5bb90acbf6717b9a14d21fdf4733c5d9e5 Mon Sep 17 00:00:00 2001 From: Andrew Lewman Date: Thu, 5 May 2011 15:18:14 -0400 Subject: [PATCH 1/2] fix the website directions. --- doc/HACKING | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index e00aeb1aa9..feafb55823 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -475,12 +475,10 @@ and push the git tag. (That's either "git tag -u tor-0.2.x.y-status", then "git push origin tag tor-0.2.x.y-status". To sign the tarball, "gpg -ba ". 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. From 330116f0343e3b7b6632d3bd1b5c9f6bca87872d Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 5 May 2011 21:53:46 -0400 Subject: [PATCH 2/2] Fix up some check-spaces issues --- src/common/compat.c | 1 - src/or/rendclient.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3644bd9996..5797374c4b 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2062,7 +2062,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: * diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 8d024d8ebb..e4a6d09f8f 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -277,7 +277,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);