Edo machi-bugyō (江戸町奉行) were magistrates or municipal administrators with responsibility for governing and maintaining order in the shogunal city of Edo. Machi-bugyō were samurai officials of the Tokugawa shogunate in Edo period Japan. Appointments to this prominent office were usually hatamoto, this was amongst the senior administrative posts open to those who were not daimyōs. Conventional interpretations have construed these Japanese titles as "commissioner", "overseer" or "governor."
During the Edo period, there were generally two hatamoto serving simultaneously as Edo machi-bugyō. There were two Edo machi-bugyō-sho within the jurisdictional limits of metropolitan Edo; and during the years from 1702 though 1719, there was also a third appointed machi-bugyō.