[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket24682'

nickm at torproject.org nickm at torproject.org
Wed Dec 20 15:15:29 UTC 2017

Previous message (by thread): [tor-commits] [tor/master] Make fallback script usage instructions create a log file
Next message (by thread): [tor-commits] [tor/master] Remove merge-conflict detritus
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit f92b5337573bcc5bf94cd034c033c11db4eca811
Merge: 83ced3e7f 1a29ad611
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 10:14:43 2017 -0500

    Merge remote-tracking branch 'teor/ticket24682'

 scripts/maint/updateFallbackDirs.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Previous message (by thread): [tor-commits] [tor/master] Make fallback script usage instructions create a log file
Next message (by thread): [tor-commits] [tor/master] Remove merge-conflict detritus
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the tor-commits mailing list