Some Thorn models have both, my Sterling does although that like many of their models is also hub gear specific which to me is a good thing on a touring bike, you might need to wade through their back catalogue to find which ones but their website has a pretty comprehensive history of the models they have sold.
Some Surly have both as well, the Troll springs to mind without looking.