commit 0cc18bd0b5f7285f810206bd3ce28a856205e275 Merge: d7fe6a2 d23b90e Author: Nick Mathewson nickm@torproject.org Date: Thu May 31 13:45:21 2012 -0400

Merge remote-tracking branch 'linus/prop186-typos'

proposals/186-multiple-orports.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)