Merge remote-tracking branch 'public/bug5647_cleanup'
commit5630b61f5c902704f4a4438c321503da2981cdac
authorNick Mathewson <nickm@torproject.org>
Fri, 20 Apr 2012 15:28:57 +0000 (20 11:28 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 Apr 2012 15:28:57 +0000 (20 11:28 -0400)
tree8d227ba43e4c209844f212915b20aaed7fa7cb64
parent774c3084310c4049246211f98ac90e380b7f3fb9
parentf2384d5e2c25469038caa84e0dedaa5e2efca29c
Merge remote-tracking branch 'public/bug5647_cleanup'