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

[arma at torproject.org]

commit e778a411b9e75ad2c1b46a6624d586a6f4a0c554
Merge: 43c18b1 144ec3d
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Feb 13 15:27:57 2017 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.6

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