Merge remote-tracking branch 'andrea/bug10616'
commit0073c5b517c7e42188214fa5b8c7b61fac6ba248
authorNick Mathewson <nickm@torproject.org>
Wed, 4 Jun 2014 19:12:45 +0000 (4 15:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 4 Jun 2014 19:12:45 +0000 (4 15:12 -0400)
treeb415a72e158caef83dd8fd71a9341dc7a457481b
parente74c3601567ab0ca14c5e2a7b9b40b416a47001e
parent9815029a2f1568cffb24919f151400b00ab82041
Merge remote-tracking branch 'andrea/bug10616'