From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 7 May 2018 17:31:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'saper/default_nickname'
X-Git-Tag: tor-0.3.4.1-alpha~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c5841a8b855b6340952a10b6014ec6cdd44ca87;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'saper/default_nickname'
---

2c5841a8b855b6340952a10b6014ec6cdd44ca87