diff options
| -rw-r--r-- | doc/HACKING | 8 | ||||
| -rw-r--r-- | src/common/compat.c | 1 | ||||
| -rw-r--r-- | src/or/rendclient.c | 2 |
3 files changed, 4 insertions, 7 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 <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. diff --git a/src/common/compat.c b/src/common/compat.c index 7b2b2fbadb..7a77f94dcf 100644 --- a/src/common/compat.c +++ b/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: * diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 1920e67ce2..838b8f7423 100644 --- a/src/or/rendclient.c +++ b/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); |