commit d9c111d954c6b3b7cd4704b4bec8d830ffa056f6 Merge: 3cb5c70 3511549 Author: Roger Dingledine <arma@torproject.org> Date: Thu Feb 6 12:28:49 2014 -0500 Merge branch 'maint-0.2.4' into release-0.2.4 changes/bug10470 | 4 ++++ doc/tor.1.txt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)