Merge remote-tracking branch 'yawning/feature15435'
commitaa7b7922505ef8dfab6df49f5537ffba92322b09
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 17:34:14 +0000 (1 13:34 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 17:34:14 +0000 (1 13:34 -0400)
tree69775b8e8c2ded448aeb18d5343b9e4f26dd3998
parent34fa4ad637ae3997b0ae31f2009a8aacc6261626
parentfda61e030e12cbd66a2be9905e6855ec6c6a3c63
Merge remote-tracking branch 'yawning/feature15435'
src/common/util.c