[tor-bugs] #5534 [Tor Directory Authority]: Make bridge authorities add "a" lines to router status entries

Tor Bug Tracker & Wiki torproject-admin at torproject.org
Fri Jun 29 17:35:03 UTC 2012


#5534: Make bridge authorities add "a" lines to router status entries
-------------------------------------+--------------------------------------
 Reporter:  ln5                      |          Owner:  ln5               
     Type:  enhancement              |         Status:  needs_review      
 Priority:  normal                   |      Milestone:  Tor: 0.2.4.x-final
Component:  Tor Directory Authority  |        Version:                    
 Keywords:                           |         Parent:  #4563             
   Points:                           |   Actualpoints:                    
-------------------------------------+--------------------------------------

Comment(by nickm):

 Oh dear. The branch seems to be pretty confused.  Have a look:

 {{{
 [1038]$ git log  --format='%h %s' master..linus/ipv6-phase3-0528 |cat
 6919f39 Don't shadow 'buf'.
 2add0c3 Remove git conflict markup.
 a2ccdc5 Add changes file for #5534.
 3340b29 Add configure option AuthDirHasIPv6Connectivity.
 4ef869e Merge branch 'ipv6-phase3' of ssh://torgit/linus/tor into
 ipv6-phase3
 78f7456 Rename routers_have_same_or_addr() to reflect the fact that it now
 checks both OR ports.
 48c69b8 Include IPv6 OR ports in status documents only if we're a bridge
 authority.
 7e376d8 Don't put unreachable IPv6 OR port in routerstatus.
 a54f487 Add "a" line to status document.
 952290a Add last_reachable and testing_since for IPv6 OR port.
 b6b8bd3 Don't assume that a node has routerinfo.
 11ab682 Move last_reachable and testing_since from routerinfo_t to node_t.
 f9f67ef Merge branch 'ipv6-phase3' of ssh://torgit/linus/tor into
 ipv6-phase3
 a123409 Cherry-pick task-5891.
 b67049c Rename routers_have_same_or_addr() to reflect the fact that it now
 checks both OR ports.
 3256a32 Include IPv6 OR ports in status documents only if we're a bridge
 authority.
 6d6d00f Don't put unreachable IPv6 OR port in routerstatus.
 8b458b8 Add "a" line to status document.
 6868706 Add last_reachable and testing_since for IPv6 OR port.
 18126dc Don't assume that a node has routerinfo.
 9bc7997 Move last_reachable and testing_since from routerinfo_t to node_t.
 1404b32 Cherry-pick task-5891.
 8021634 Merge branch 'ipv6-phase3' of ssh://torgit/linus/tor into
 ipv6-phase3
 4e40e48 Rename routers_have_same_or_addr() to reflect the fact that it now
 checks both OR ports.
 d8ffaad Include IPv6 OR ports in status documents only if we're a bridge
 authority.
 9657a87 Don't put unreachable IPv6 OR port in routerstatus.
 264d8a7 Add "a" line to status document.
 b2b8cae Add last_reachable and testing_since for IPv6 OR port.
 2ffa692 Don't assume that a node has routerinfo.
 ba5e17e Move last_reachable and testing_since from routerinfo_t to node_t.
 a7d0079 Rename routers_have_same_or_addr() to reflect the fact that it now
 checks both OR ports.
 1f160db Include IPv6 OR ports in status documents only if we're a bridge
 authority.
 03e2e19 Don't put unreachable IPv6 OR port in routerstatus.
 4ac4f71 Add "a" line to status document.
 563267c Add last_reachable and testing_since for IPv6 OR port.
 85a9b0e Don't assume that a node has routerinfo.
 972a6cb Move last_reachable and testing_since from routerinfo_t to node_t.
 }}}

 See how the same commits show up a few times with different IDs?  That
 looks a lot like you rebased the same branch a few times, and merged all
 versions of the branch together.

 I will try to come up with some kind of cherry-picked thing that has only
 one copy each of the commits that actually belong here in sequence, unless
 you can get to it first.

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


More information about the tor-bugs mailing list