Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
commit1af67d7f72470cec1de5e2a75186edc3b3accfbe
authorNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2015 23:47:12 +0000 (9 19:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 Mar 2015 23:47:12 +0000 (9 19:47 -0400)
treed418806be60767dcdd1a19f7d072b580783921f5
parent7c9be64e1af05aa1fdac894ffe9ef98f80091d57
parent24c031b1a28658c921a746f4d58f3ca5e9994108
Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6
src/common/compat.h