Merge branch 'bug18616-v4-merged_028' into maint-0.2.8
commitd6a2fec05ebcc39773a2f6666e1378410c64f047
authorNick Mathewson <nickm@torproject.org>
Tue, 17 May 2016 15:09:54 +0000 (17 11:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 17 May 2016 15:09:54 +0000 (17 11:09 -0400)
treec962faa2f33eede043d67419e0cfbba80a3b8653
parentff5eb7fc625374c29944b9ab7160b86559ce90a4
parent548d14247e3c8a48e2efb2ca62ee7a05fca843ba
Merge branch 'bug18616-v4-merged_028' into maint-0.2.8