]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'teor/comments-20151123'
authorNick Mathewson <nickm@torproject.org>
Wed, 25 Nov 2015 14:08:15 +0000 (09:08 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 Nov 2015 14:08:15 +0000 (09:08 -0500)
commit45caeec9a03d7caca13ef4d6caeda23f7bb3129e
tree16bf6c62b791ccc932c193fd6b5662721bf87d4b
parentab1bc38d5ae28be7666a2b896d45aebe3ec5ce4b
parent5b2adfb3d431b8f39cbddbd530840cacbb9b5ce5
Merge remote-tracking branch 'teor/comments-20151123'
src/common/crypto.c
src/or/config.c
src/or/or.h