commit e00503fe57e5459c6df57d993f3b3290e97262d9 Merge: a598d0f d7ac4d9 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jan 27 12:42:12 2015 -0500 Merge branch 'doc13702_squashed' changes/doc13702 | 4 ++++ doc/TUNING | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+)