[tor-commits] [torspec/master] Merge branch 'tor-github/pr/55'

[dgoulet at torproject.org]

commit 7e2e3308f5ebb2b4b4ff24d3307b56366c3e24e2
Merge: 4a3c358 87abfd8
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Feb 15 09:39:52 2019 -0500

    Merge branch 'tor-github/pr/55'

 socks-extensions.txt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)