Merge branch 'tor-github/pr/1043'
commit130eb227acd8a8717dcc5258c4dd5b2adc79930b
authorGeorge Kadianakis <desnacked@riseup.net>
Mon, 27 May 2019 11:20:51 +0000 (27 14:20 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Mon, 27 May 2019 11:20:51 +0000 (27 14:20 +0300)
tree87694980cc507a97530aa4f82f5d3cd95205b559
parent94914e2a4d7f778e2f63493c09984a3721919744
parentfcd51fd49f8c30ab8d5d1d099d43e510187150c6
Merge branch 'tor-github/pr/1043'