[tor-commits] [tor/master] Merge remote-tracking branch 'ahf-gitlab/ahf/24062-simpleperf'

[nickm at torproject.org]

commit ce793ec0a9d02a8eb20c6500d0fcafcdad4e4da2
Merge: bf882b037 251983eb8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 21 14:09:56 2017 -0500

    Merge remote-tracking branch 'ahf-gitlab/ahf/24062-simpleperf'

 doc/HACKING/android/Simpleperf.md | 98 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 98 insertions(+)