Merge remote-tracking branch 'public/bug12693_025'
commite6150c7fc079d7841bedd0df838b29aef0f497d7
authorNick Mathewson <nickm@torproject.org>
Mon, 22 Sep 2014 18:45:38 +0000 (22 14:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 22 Sep 2014 18:45:38 +0000 (22 14:45 -0400)
tree2f5f3a108a7522ab94c22c43db3a61650e685984
parent2b3822d2daf884b39f2405d3bb1d1eb073557a28
parent883dc335e9ea3e0d944ce5cb3c6f140a6cad6ff1
Merge remote-tracking branch 'public/bug12693_025'
configure.ac