]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'dgoulet/bug19899_030_01'
authorNick Mathewson <nickm@torproject.org>
Fri, 23 Dec 2016 13:28:05 +0000 (08:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 23 Dec 2016 13:28:05 +0000 (08:28 -0500)
commit9fb2bf2f3f5ae63da8e8c043f3f8488a6aad0ded
tree69724e20031e49940d5822c849b9806998d7752b
parentd528690e90914dfa028b6afbccb80f3b5f02dc87
parent3ee9a6d6fdde3a05620e6c0e14eea6a1957616f4
Merge remote-tracking branch 'dgoulet/bug19899_030_01'
src/or/directory.c
src/or/hs_common.c
src/or/hs_common.h