[tor-commits] [bridgedb/master] Merge branch 'feature/9937-desc-gen-r1' into develop.

commit 64ff94fe6364fa9d22c9e9eda6faf04dcb9a8756 Merge: c9dc17e 686c3c0 Author: Isis Lovecruft isis@torproject.org Date: Fri Oct 11 00:48:21 2013 +0000

Merge branch 'feature/9937-desc-gen-r1' into develop.

The 'feature/9937-desc-gen-r1' branch is actually the entirety of a separate repo, https://github.com/sysrqb/tdgen from the master branch. It was merged by doing:

$ git clone https://github.com/sysrqb/tdgen && cd tdgen $ cd ../bridgedb $ git checkout -b feature/9937-desc-gen develop $ git remote add tdgen ../tdgen $ git fetch tdgen $ git merge -S --no-ff tdgen/master

generatedescriptors.py | 107 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+)