[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12985_024' into bug12985_025

commit 139a1c64a0333d7a2af6715e827d5858628683f4 Merge: d8fe499 e9463b0 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 7 11:54:33 2015 -0500 Merge remote-tracking branch 'public/bug12985_024' into bug12985_025 changes/bug12985 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)