Merge branch 'maint-0.2.5' into maint-0.2.6
commit210928f66a5acda19d3a0a00d44f1f9523fecfe3
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Jul 2016 10:31:54 +0000 (19 12:31 +0200)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Jul 2016 10:31:54 +0000 (19 12:31 +0200)
tree38b5a9ac7997ddf04ebed56329d7c5f2d8e57479
parent92891ded3016dd7cabb34b401ff964e325bd7d1d
parentd95c2809b39fc45b7c30b0f29284bae7384c7224
Merge branch 'maint-0.2.5' into maint-0.2.6