[Pkg-privacy-commits] [txtorcon] 77/96: Merge pull request #101 from sammyshj/checkmultiplehsdir

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository txtorcon.

commit 0f349271635f2efd443a3e7fdd953abe26b16f7d
Merge: 28f8ce8 bb0cd71
Author: meejah <meejah at meejah.ca>
Date:   Wed Apr 1 21:49:52 2015 -0600

    Merge pull request #101 from sammyshj/checkmultiplehsdir
    
    Check multiple hidden services with same directory

 test/test_torconfig.py | 21 +++++++++++++++++++++
 txtorcon/torconfig.py  | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 48 insertions(+), 14 deletions(-)

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