Merge branch 'tor-github/pr/1042'
commit0a86f14addd031ac69647f4ab6fc66c1835cd31e
authorGeorge Kadianakis <desnacked@riseup.net>
Mon, 27 May 2019 11:22:01 +0000 (27 14:22 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Mon, 27 May 2019 11:22:01 +0000 (27 14:22 +0300)
tree261048cee8403aecb355f24fa9f0dfd0c43f4802
parent130eb227acd8a8717dcc5258c4dd5b2adc79930b
parent57ee0e3af98e5dce398e8bc7f6f2b77e53208288
Merge branch 'tor-github/pr/1042'