]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'isis/fix/circuitlist-docstring-typo'
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Aug 2015 13:25:23 +0000 (09:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Aug 2015 13:25:23 +0000 (09:25 -0400)

Trivial merge