Opened 4 months ago

Closed 4 months ago

#30224 closed defect (implemented)

Add the tor versions for bridge-distribution-request

Reported by: teor Owned by: teor
Priority: Medium Milestone: Tor: 0.4.1.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: tor-spec, fast-fix
Cc: Actual Points: 0.2
Parent ID: Points: 0.1
Reviewer: catalyst Sponsor: Sponsor19-can

Description

dir-spec says it's not implemented, but it was implemented in 0.3.2.3-alpha and backported.

#18329 was Sponsor M, but the relevant current sponsor is Sponsor 19.

Child Tickets

Change History (6)

comment:1 Changed 4 months ago by teor

Status: assignedneeds_review

comment:2 Changed 4 months ago by asn

Reviewer: catalyst

comment:3 Changed 4 months ago by catalyst

The text of the changes looks good. It would be great if someone who knew the relevant history could fact-check the change. (I think I don't know enough to do so without possibly extensive research.)

comment:4 Changed 4 months ago by teor

Actual Points: 0.10.2

Here's how I found the feature version in tor:

$ git log -S bridge-distribution-request --reverse
commit ebab521525
Author: Roger Dingledine <arma@torproject.org>
Date:   Sun Nov 13 02:39:16 2016 -0500

    Add new BridgeDistribution config option
    
    Bridge relays can use it to add a "bridge-distribution-request" line
    to their bridge descriptor, which tells BridgeDB how they'd like their
    bridge address to be given out.
    
    Implements tickets 18329.
...
$ git describe --contains ebab521525
tor-0.3.2.3-alpha~15^2~4

And here's how I found the backport versions:

$ git log tp/maint-0.3.1 -S bridge-distribution-request --reverse
commit 9f2efd02a1 (nickm/ticket18329_minimal_025)
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon Nov 13 20:44:51 2017 -0500

    Minimal implementation of bridge-distribution-request
    
    Just advertise the line when we're a bridge, using "any" if we're
    published or "none" if we aren't.
    
    This is done in lieu of a full backport of #18329.
$ git tag --contains 9f2efd02a1 | sort -V
tor-0.2.5.16
tor-0.2.8.17
tor-0.2.9.14
tor-0.2.9.15
tor-0.2.9.16
tor-0.2.9.17
tor-0.3.0.13
tor-0.3.1.9
tor-0.3.1.10
tor-0.3.2.5-alpha
...

I didn't use sort -V when I was writing the patch, so I got the 0.3.1 backport version wrong. I pushed a commit that changes the version to 0.3.1.9.

comment:5 in reply to:  4 Changed 4 months ago by catalyst

Status: needs_reviewmerge_ready

Replying to teor:

Here's how I found the feature version in tor:

Thanks! I've confirmed this.

comment:6 Changed 4 months ago by nickm

Resolution: implemented
Status: merge_readyclosed

Thanks for the patch and the review! I've merged this to torspec.

Note: See TracTickets for help on using tickets.