From: Nick Mathewson Date: Mon, 7 Nov 2016 14:20:13 +0000 (-0500) Subject: Merge branch '20499_part1_029_squashed', remote-tracking branches 'teor/bug20591_029... X-Git-Tag: tor-0.2.9.5-alpha~10^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d82ffb77f3345497480a074d32f8350c481902df;p=thirdparty%2Ftor.git Merge branch '20499_part1_029_squashed', remote-tracking branches 'teor/bug20591_029' and 'teor/bug20533_029' into maint-0.2.9 --- d82ffb77f3345497480a074d32f8350c481902df