]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Sep 2014 02:12:47 +0000 (22:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Sep 2014 02:12:47 +0000 (22:12 -0400)
commita9b2e5eac6168a1eb09da8d6d3ff43b08cc51411
tree12f0900fd451189aee10b9fcd36469b7bdb08ead
parent8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7
parenta3fe8b11663a32f1f007bd7cb0b9656825093544
Merge remote-tracking branch 'public/bug12908_025' into maint-0.2.5
src/or/config.c