[tor-commits] [tor/master] Merge remote-tracking branch 'nickm/bug5438'

[arma at torproject.org]

commit 6718b6e78106a110894654db7bf7cc848e2d04c4
Merge: 54d0cde 548f2e3
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Apr 23 02:03:40 2012 -0400

    Merge remote-tracking branch 'nickm/bug5438'

 changes/no-listenaddr      |    3 +++
 src/config/torrc.sample.in |   27 ++++++++++++++-------------
 2 files changed, 17 insertions(+), 13 deletions(-)