commit 901659e21373c87815d8808527b21e002fb662fd Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 23 11:24:09 2012 -0500

Note that UTCExpiry is omitted when Expiry is Never

This corrects the format of addrmap events.

Fix for 6829 --- control-spec.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt index 378fbbf..43212a5 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1543,7 +1543,7 @@

Syntax: "650" SP "ADDRMAP" SP Address SP NewAddress SP Expiry - [SP Error] SP UTCExpiry CRLF + [SP Error] [SP UTCExpiry] CRLF

NewAddress = Address / "<error>" Expiry = DQUOTE ISOTime DQUOTE / "NEVER" @@ -1556,7 +1556,7 @@

Expiry is expressed as the local time (rather than UTC). This is a bug, left in for backward compatibility; new code should look at UTCExpiry - instead. + instead. (If Expiry is "NEVER", UTCExpiry is omitted.)

These events are generated when a new address mapping is entered in the cache, or when the answer for a RESOLVE command is found.