[tor-commits] [torspec/master] Merge remote-tracking branch 'mikeperry/mapaddress-check'

[nickm at torproject.org]

commit fd5b1fdf1b24ab89fb11dbd43ad13158023e68b1
Merge: 7dd4523 ea37bb4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 11 10:37:41 2012 -0400

    Merge remote-tracking branch 'mikeperry/mapaddress-check'

 proposals/xxx-mapaddress-tor-status.txt |  144 +++++++++++++++++++++++++++++++
 1 files changed, 144 insertions(+), 0 deletions(-)