[tor-commits] [bridgedb/master] Merge branch 'hotfix/9937-desc-gen_base64-padding-descDigest' into develop

[isis at torproject.org]

commit d0ea228197014884c9ac1cdc0388357e88d7a96c
Merge: 6b31a52 475d711
Author: Isis Lovecruft <isis at torproject.org>
Date:   Wed Dec 11 01:57:05 2013 +0000

    Merge branch 'hotfix/9937-desc-gen_base64-padding-descDigest' into develop

 scripts/gen_bridge_descriptors |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)