[Pkg-privacy-commits] [txtorcon] 07/49: Merge branch 'master' of github.com:meejah/txtorcon

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository txtorcon.

commit 6f3897b3a8b3aa6b32a19cabccb83b51ad10d7d1
Merge: 7c8f4f2 c428f4f
Author: meejah <meejah at meejah.ca>
Date:   Sun May 10 01:43:31 2015 -0600

    Merge branch 'master' of github.com:meejah/txtorcon

 README.rst                      |  4 ++++
 docs/index.rst                  |  2 +-
 test/test_torcontrolprotocol.py |  9 +++++++++
 test/test_torinfo.py            |  3 +++
 txtorcon/torcontrolprotocol.py  | 13 ++++++-------
 5 files changed, 23 insertions(+), 8 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/txtorcon.git