commit f602172dbaa9b0db49d6de993c9e13a48d12079f Merge: e7ade23 10baf2c Author: Nick Mathewson <ni...@torproject.org> Date: Wed Dec 7 18:28:09 2016 -0500
Merge branch 'maint-0.2.8' into maint-0.2.9
(ours merge, to avoid taking 20865 fix)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
