Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4
commit8836c1ee2f460422a688781c79760652524c3d6e
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Feb 2014 23:55:26 +0000 (11 18:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Feb 2014 23:55:26 +0000 (11 18:55 -0500)
tree92a27b535e00d589512be02f318dc27b708cc45b
parent7f6aa780e3183f34b2fa771e17813018e6b28115
parentb15f75b63266742aa6aa358c553799a31f0b350e
Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4