[Pkg-privacy-commits] [txtorcon] 11/96: Merge remote-tracking branch 'kalikaneko/fix-refactor'

[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 e9f1d45dce83a0097745f43a7b34c2eda387bbac
Merge: b2b41c4 78ae195
Author: mike warren <mike.warren at chaordix.com>
Date:   Sat Sep 20 22:23:12 2014 -0600

    Merge remote-tracking branch 'kalikaneko/fix-refactor'

 docs/walkthrough.rst  |  32 +++++++-----
 txtorcon/endpoints.py |  68 ++++++++++++++++---------
 txtorcon/torconfig.py | 138 +++++++++++++++++++++++++++++---------------------
 3 files changed, 144 insertions(+), 94 deletions(-)

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