[tor-bugs] #1837 [BridgeDB]: bridgedb learns to load file of which bridges are blocked where

[Tor Bug Tracker & Wiki]

#1837: bridgedb learns to load file of which bridges are blocked where
----------------------+-----------------------------------------------------
 Reporter:  arma      |          Owner:              
     Type:  defect    |         Status:  needs_review
 Priority:  normal    |      Milestone:              
Component:  BridgeDB  |        Version:              
 Keywords:            |         Parent:  #1608       
   Points:            |   Actualpoints:              
----------------------+-----------------------------------------------------

Comment(by karsten):

 Replying to [comment:15 aagbsn]:
 > Replying to [comment:14 karsten]:
 > > aagbsn, can you prepare a branch with single commit on top of master
 that I can merge?
 >
 > Done, but I don't think it makes sense for #2678
 > https://github.com/aagbsn/bridgedb/commits/master

 That branch does not contain the #1837 changes in a single commit on top
 of master.  When I look at the history of your master branch, I see 42
 commits that are not in origin/master, including recaptcha stuff that
 shouldn't be there, because it's not part of #1837.  I can't merge that
 branch.  Can you clean up the branch to only contain the #1837 parts, or
 should I do that?

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