Merge remote-tracking branch 'atagar/ticket_6445'
commit4bd7a767a89dab244d0731e906e5d2a3137737e7
authorNick Mathewson <nickm@torproject.org>
Mon, 23 Jul 2012 16:41:42 +0000 (23 12:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 23 Jul 2012 16:41:42 +0000 (23 12:41 -0400)
tree9b0ae7f281427eadfaa5f951f7bc3debf6400067
parentec9ca811f71b36d2f3cf498da68fafc250d863b5
parent8b4a12a25b4d069fd09e6a7444f33e33d50d43f8
Merge remote-tracking branch 'atagar/ticket_6445'