commit 031565788c66f89069b946cdabe5f189e44e04ed Merge: ed52bc5 39556e3 Author: Isis Lovecruft <isis@torproject.org> Date: Mon Oct 14 22:05:59 2013 +0000 Merge branch 'hotfix/9937-desc-gen_fix-tabs' into develop scripts/gen_bridge_descriptors | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)