[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm@xxxxxxxxxxxxxx]

commit 4c5eb0b21d65a565aaeda4d44d4c8ff6e89bbec7
Merge: f2445fc a40d212
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Sun Dec 11 20:37:22 2016 -0500

    Merge branch 'maint-0.2.9'
    
    This is an "ours" merge to avoid taking a40d2123834cd55e77ed7668,
    which quiets a warning we'd like to keep seeing in alphas.

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