]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.3.3' into maint-0.3.4
authorNick Mathewson <nickm@torproject.org>
Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 29 Jun 2018 17:06:15 +0000 (13:06 -0400)
commitf6b30a97a96837e012b296a43cc99018d96bcf13
treec54975bf9670ab98e42c5f917afc075f72846aa8
parent5ab23e03fa0a8bce11798cbf025139e9653b9be4
parentf82f8179e65c5e0021da46fd24e4bd7d8126d8f7
Merge branch 'maint-0.3.3' into maint-0.3.4
src/or/directory.c
src/or/hs_descriptor.c
src/test/test_channelpadding.c
src/test/test_hs_descriptor.c