[tor-commits] [tor/master] Merge branch 'maint-0.2.6' into maint-0.2.7

[arma at torproject.org]

commit 5c4235888af142b72aa6b88737bcf1020797e35c
Merge: 75fe218 e778a41
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Feb 13 15:28:50 2017 -0500

    Merge branch 'maint-0.2.6' into maint-0.2.7

 changes/bug20384 | 10 ++++++++++
 1 file changed, 10 insertions(+)