Merge remote-tracking branch 'rransom-tor/bug4605'
commitfdc0aa8c458f13c3a5ad65e680326119c1e26ac1
authorNick Mathewson <nickm@torproject.org>
Wed, 30 Nov 2011 01:28:08 +0000 (29 20:28 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 30 Nov 2011 01:28:08 +0000 (29 20:28 -0500)
treef6f02f797e7efeb3b9f8e31c46adb76d23d863e5
parent8bb23c7def49e5a090d337e56eee8398261d9fb6
parente70610878afe63f5c58798edf3648e0cb54b157a
Merge remote-tracking branch 'rransom-tor/bug4605'
src/or/config.c