[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.3

[nickm@xxxxxxxxxxxxxx]

commit d1c0dbabfaa2d26839af55c834677b667479b369
Merge: 4cca7fb99 dd6c2b0ad
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 23 09:50:38 2019 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.3
    
    "ours" merge to avoid dropping non-broken changes files after
    removal of merged 0.2.9 changes files.




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