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.)
$ git log -S bridge-distribution-request --reversecommit ebab521525Author: 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 ebab521525tor-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 --reversecommit 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 -Vtor-0.2.5.16tor-0.2.8.17tor-0.2.9.14tor-0.2.9.15tor-0.2.9.16tor-0.2.9.17tor-0.3.0.13tor-0.3.1.9tor-0.3.1.10tor-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.