[tor-commits] [torflow/master] Merge remote branch 'aagbsn/4355-documentation-inconsistency'

[mikeperry at torproject.org]

commit 2fea9e266636067216ebb9885fc08ac6fcc9993e
Merge: 88f0912 556ebd5
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Wed Nov 9 15:02:29 2011 -0800

    Merge remote branch 'aagbsn/4355-documentation-inconsistency'

 NetworkScanners/BwAuthority/README.BwAuthorities |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)