Merge remote-tracking branch 'teor/configure-use-colon'
commit5342760a5b2d50dd63a6f53eddf37b69dadb9b85
authorNick Mathewson <nickm@torproject.org>
Thu, 10 Sep 2015 14:03:44 +0000 (10 10:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 10 Sep 2015 14:03:44 +0000 (10 10:03 -0400)
tree4c3f1de03de263ace00bec7ffbbac690a3806277
parent6f35fd07c992db78e4d951566631c69b74e3531b
parentc6383bf90bbe96c413122f823fc7f8f735ee47fa
Merge remote-tracking branch 'teor/configure-use-colon'