Merge remote-tracking branch 'origin/maint-0.2.5'
commitd8517fe8435dbe9e4593d04fa8ec4db464513892
authorNick Mathewson <nickm@torproject.org>
Fri, 23 Jan 2015 13:53:21 +0000 (23 08:53 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 23 Jan 2015 13:53:21 +0000 (23 08:53 -0500)
treedcc5b1ae3ff9383a9b1ce887239e7e41d116e682
parent4a6b43bf76a993b0167f28f875cd4cf922daba71
parent7cbdec578b291da11dcd419988ee985b7589ec48
Merge remote-tracking branch 'origin/maint-0.2.5'