]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'linus/bug6880'
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Sep 2012 20:05:09 +0000 (16:05 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Sep 2012 20:05:09 +0000 (16:05 -0400)
commit5dfec9f8335d0fa954ff5423a41e3e249547fd8d
treed2b30c0fea6353df57f85cd5ee2b3e8a8cced116
parent1e5cd1c7d6f45456c5e7c1b288e5e02e7c02b377
parentbee1e46bd179b4085f47f3f3fc34db94e67e1c72
Merge remote-tracking branch 'linus/bug6880'
src/or/dirserv.c