Merge branch 'maint-0.2.4' into maint-0.2.5
commitdb2571be619530389c7ca3066cfc86b32cfc7578
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:29:54 +0000 (7 09:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Nov 2016 14:29:54 +0000 (7 09:29 -0500)
treeabc31b2eb9fa15f5cee16d2b8792b75a8d4a8b17
parent304d8f3bbbf063c2ee504568dde134296a2025ca
parentea597832e25e776a45375d18a973e079ca32d424
Merge branch 'maint-0.2.4' into maint-0.2.5