Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
commitbe0e26272b3e795b902394acc9b66642fcdc1f21
authorNick Mathewson <nickm@torproject.org>
Tue, 16 Sep 2014 15:10:02 +0000 (16 11:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 16 Sep 2014 15:10:02 +0000 (16 11:10 -0400)
treee02f29a15876f84ea73b4fbf3e43ad483a9c05c0
parent550c03336ccc256dd9221d2cf9fdc5cef1f87908
parent0c3b3650aa831183c76b044466e89eaee36d5684
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
src/or/rendclient.c