[Pkg-privacy-commits] [txtorcon] 29/49: Merge remote-tracking branch 'samgtr/updategetinfo'

[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 830d26a573c24e8350ae41fba1f9a67777401709
Merge: 17e9b86 f766b94
Author: meejah <meejah at meejah.ca>
Date:   Tue Jun 23 08:39:32 2015 -0600

    Merge remote-tracking branch 'samgtr/updategetinfo'

 test/test_torcontrolprotocol.py | 45 ++++++++++++++++++++++++++++++++++++++++-
 txtorcon/torcontrolprotocol.py  | 15 +++++++++++---
 2 files changed, 56 insertions(+), 4 deletions(-)

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