Merge branch 'refuseunknown' into maint-0.2.2
commit7c83b0a2a2b36a2ae2296f826ec53e5f7cd29a97
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 21:15:57 +0000 (27 17:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 21:15:57 +0000 (27 17:15 -0400)
tree1b30cc68486aa9e4e86d5ee7e3252715af07b4f7
parentc97072ef34c20fdf854444bb28446b53f67ba7bf
parent8ac2de5ab98522abaa3289d6db155567e6126b50
Merge branch 'refuseunknown' into maint-0.2.2
doc/tor.1.txt