Merge remote-tracking branch 'origin/pr/175'
authorNick Mathewson <nickm@torproject.org>
Sun, 30 Nov 2014 16:11:33 +0000 (11:11 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 30 Nov 2014 16:11:33 +0000 (11:11 -0500)
commitc51c85d397c3838cdc81c7dd6a232f3551338ed8
tree41f6ee3d60e84a7b19d4419812614e5e1e9806db
parenta5d43cf4c6a6d4c1fbb7ed244eac9124317d273d
parentbc79cc5c80ee374dec0e968bc6fdf301d479e133
Merge remote-tracking branch 'origin/pr/175'