[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tor/release-0.3.5] Merge branch 'bug30184_029' into bug30184_034

commit dfdd877647ef496b2b4a82e8c1e6040692ecebb5
Merge: 48e990359 031ed59db
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Wed Apr 17 11:51:32 2019 +1000

    Merge branch 'bug30184_029' into bug30184_034
    
    "ours" merge, because 0.3.4 has a different set of changes,
    which already compile.




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits