[tor-commits] [chutney/master] Merge remote-tracking branch 'huig/master'

[nickm at torproject.org]

commit b19d238e24dffb5af4b5ad50cd767c597cb3255e
Merge: b36c79c f7e8eda
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 29 10:15:51 2014 -0500

    Merge remote-tracking branch 'huig/master'

 lib/chutney/TorNet.py |    3 ++-
 tools/hsaddress.sh    |   43 +++++++++++++++++++++++++++++++++++++++++++
 tools/warnings.sh     |   45 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+), 1 deletion(-)