[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.5' into maint-0.2.6

nickm at torproject.org nickm at torproject.org
Thu Jun 8 18:07:17 UTC 2017


commit eb92d11f53dd2245f4cfd618bde3996e76b498cf
Merge: 95a88f7 1a7af74
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 8 14:05:59 2017 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.6
    
    "ours" merge to avoid version bump.






More information about the tor-commits mailing list