Changes between Initial Version and Version 1 of Ticket #29280, comment 30


Ignore:
Timestamp:
Jun 14, 2019, 10:28:54 AM (2 months ago)
Author:
teor
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #29280, comment 30

    initial v1  
    22So do the merges.
    33
    4 0.3.5 and later is going to conflict with #30591, let's try to merge this change, then rebase #30591. (#29280 is more complex than #30951, which is a simple patch on 0.3.5 and a clean merge forward.)
     40.3.5 and later is going to conflict with #30591, let's try to merge this change, then rebase #30591. (#29280 is more complex than #30591, which is a simple patch on 0.3.5 and a clean merge forward.)
    55
    66I like that we are re-using "make test-network-all", there's no need to mess around with chutney networks vs tor versions.
     
    2121There's one fix that I would do, but feel free to do whatever you think is easiest to maintain and read:
    2222* remove the redundant os: linux line (see my comment in the pull request)
     23
     24Edit: fix ticket number