]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Wed, 17 Jun 2015 13:19:11 +0000 (09:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 17 Jun 2015 13:19:11 +0000 (09:19 -0400)
commit43a98c7da6183e6e2e20784faed9f1c8aea5086e
treefe1a0ecdc8e30d6d93b1941aa953a239f37f205f
parent8092ae0c4ecc05d2bc058531be976e374febd9cb
parentc8cb55659acca96530a1d7f54bb96cac84626e17
Merge remote-tracking branch 'origin/maint-0.2.6'
src/or/main.c