Merge branch 'tor-github/pr/1898'
commit8d8a9d7f1d9cc779036441cfa9639f35c20e37c9
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 27 May 2020 12:17:55 +0000 (27 15:17 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 27 May 2020 12:17:55 +0000 (27 15:17 +0300)
treefa798e0c6ad15a1419061af4f99fe2456f4963bb
parent43f4324e29855bced51cb9c8f126bfb35e93fb2c
parentf6943d702c6287f7c92d2a34bdcd666c10878517
Merge branch 'tor-github/pr/1898'
src/app/main/main.c