Merge branch 'bug18841_1_025' into maint-0.2.7
commit039fc8427a512efce87b7bd21c10c4adca4ba30d
authorNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 16:22:36 +0000 (11 12:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 16:22:36 +0000 (11 12:22 -0400)
tree2b317b911ad917c854f5584c3521b54c3e0e9d90
parent61c0bae4f20556cf155562582ea00a6a147252d6
parentc662bef45595e40106becfbdbb39811300d15a7f
Merge branch 'bug18841_1_025' into maint-0.2.7
configure.ac