From: Nick Mathewson Date: Tue, 2 Jun 2015 18:51:13 +0000 (-0400) Subject: Merge remote-tracking branch 'teor/bug16115-minor-fixes' X-Git-Tag: tor-0.2.7.2-alpha~101 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34edf17d88a5eaf7bd10aaa557ac5af5c85fa71f;p=thirdparty%2Ftor.git Merge remote-tracking branch 'teor/bug16115-minor-fixes' --- 34edf17d88a5eaf7bd10aaa557ac5af5c85fa71f