[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

commit 28485d33ca64ee3989f6993a1c30f265be9e324f Merge: ca6949e edaea77 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Aug 16 22:00:14 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/doc-heartbeat-loglevel | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)