commit 79e534859b02c97418d9d46f524371defd2417d3 Merge: c8eb39d 7d6e7fd Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 28 16:13:02 2016 -0400 Merge remote-tracking branch 'sebastian/onlyonly' into maint-0.2.8 doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)