]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8
authorNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 17:20:51 +0000 (13:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 11 May 2016 17:20:51 +0000 (13:20 -0400)
commit8d962233f65022dc7fbc0466c981e3e7f2aea0c8
tree3baada7455fb9154bd080018a93e9c941f1bbcd3
parent24fbb9a81b19cc20df9a204d3203d1b914fb267d
parent797ece042d9666beae3ffc801b148e8bebcd88c0
Merge remote-tracking branch 'teor/bug18816_simplify' into maint-0.2.8