commit a57e168caa21f9798be85adb56af726da7385810
Merge: 5df0b3662 9b7cdd23d
Author: teor
Date: Mon Aug 12 09:36:14 2019 +1000
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5
doc/tor.1.txt | 13 +++--
src/config/torrc.sample.in | 21
commit 04cb2d4010f131c970d0cf3ba56c9d752b8facb9
Merge: 2300a619a 9b7cdd23d
Author: Nick Mathewson
Date: Wed Jun 5 16:14:51 2019 -0400
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0
doc/tor.1.txt | 13 +++--
src/config/torrc.sample.in | 21
commit f8dc935fb7f2d5fb2a5ec4224c7d99f0f177608e
Merge: 3c64cfe64 9b7cdd23d
Author: Nick Mathewson
Date: Thu Apr 11 14:27:06 2019 -0400
Merge remote-tracking branch 'tor-github/pr/741'
doc/tor.1.txt | 13 +++--
src/config/torrc.sample.in | 21 -
2
