[tor-bugs] #25546 [Core Tor/Tor]: Merge last vanguard-related tor patches

[Tor Bug Tracker & Wiki]

#25546: Merge last vanguard-related tor patches
-------------------------------------------------+-------------------------
 Reporter:  asn                                  |          Owner:  (none)
     Type:  defect                               |         Status:  new
 Priority:  Medium                               |      Milestone:  Tor:
                                                 |  0.3.4.x-final
Component:  Core Tor/Tor                         |        Version:
 Severity:  Normal                               |     Resolution:
 Keywords:  tor-guard guard-discovery 034        |  Actual Points:
  -roadmap-master                                |
Parent ID:                                       |         Points:
 Reviewer:  asn                                  |        Sponsor:
-------------------------------------------------+-------------------------
Changes (by nickm):

 * keywords:  tor-guard guard-discovery => tor-guard guard-discovery 034
     -roadmap-master


--
Ticket URL: <https://trac.torproject.org/projects/tor/ticket/25546#comment:1>
Tor Bug Tracker & Wiki <https://trac.torproject.org/>
The Tor Project: anonymity online