commit 5342760a5b2d50dd63a6f53eddf37b69dadb9b85 Merge: 6f35fd0 c6383bf Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 10 10:03:44 2015 -0400

Merge remote-tracking branch 'teor/configure-use-colon'

configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)