From: Nick Mathewson Date: Tue, 17 May 2016 16:15:53 +0000 (-0400) Subject: Merge remote-tracking branch 'teor/bug18963-remember-v2' X-Git-Tag: tor-0.2.9.1-alpha~233 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36909674b45d05854b821b6ac5952126a2cd2ab3;p=thirdparty%2Ftor.git Merge remote-tracking branch 'teor/bug18963-remember-v2' --- 36909674b45d05854b821b6ac5952126a2cd2ab3