]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'dgoulet/ticket20568_030_01'
authorNick Mathewson <nickm@torproject.org>
Thu, 1 Dec 2016 14:23:36 +0000 (09:23 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 1 Dec 2016 14:23:36 +0000 (09:23 -0500)
1  2 
src/or/hs_descriptor.c
src/or/torcert.c

Simple merge
Simple merge