tor 0.2.4.21/devel 0.2.5.2-alpha

https://lists.torproject.org/pipermail/tor-talk/2014-March/032242.html
https://lists.torproject.org/pipermail/tor-talk/2014-February/032150.html

Closes #27298.

Signed-off-by: Brett Koonce <koonce@gmail.com>