4 files changed, 68 insertions, 14 deletions
diff --git a/contrib/epee/include/net/abstract_tcp_server2.h b/contrib/epee/include/net/abstract_tcp_server2.h
index cb387d39f..f0a1ddd7c 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.h
+++ b/contrib/epee/include/net/abstract_tcp_server2.h
@@ -300,7 +300,6 @@ namespace net_utils
     boost::thread::id m_main_thread_id;
     critical_section m_threads_lock;
     volatile uint32_t m_thread_index; // TODO change to std::atomic
-    void detach_threads();
 
     t_connection_type m_connection_type;
 
diff --git a/contrib/epee/include/net/abstract_tcp_server2.inl b/contrib/epee/include/net/abstract_tcp_server2.inl
index 94dbe7458..dbdfbc74d 100644
--- a/contrib/epee/include/net/abstract_tcp_server2.inl
+++ b/contrib/epee/include/net/abstract_tcp_server2.inl
@@ -827,7 +827,7 @@ POP_WARNINGS
       }
       CRITICAL_REGION_END();
       // Wait for all threads in the pool to exit.
-      if (wait)  // && ! ::cryptonote::core::get_is_stopping()) // TODO fast_exit
+      if (wait)
       {
 		_fact("JOINING all threads");
         for (std::size_t i = 0; i < m_threads.size(); ++i) {
@@ -897,10 +897,6 @@ POP_WARNINGS
   template<class t_protocol_handler>
   void boosted_tcp_server<t_protocol_handler>::send_stop_signal()
   {
-    if (::cryptonote::core::get_fast_exit() == true)
-    {
-		detach_threads();
-	}
     m_stop_signal_sent = true;
     TRY_ENTRY();
     connections_mutex.lock();
@@ -1144,14 +1140,6 @@ POP_WARNINGS
     return true;
     CATCH_ENTRY_L0("boosted_tcp_server<t_protocol_handler>::connect_async", false);
   }
-  //---------------------------------------------------------------------------------
-  template<class t_protocol_handler>
-  void  boosted_tcp_server<t_protocol_handler>::detach_threads()
-  {
-	for (auto thread : m_threads)
-		thread->detach();
-  }
-  
   
 } // namespace
 } // namespace
diff --git a/contrib/rlwrap/monerocommands_bitmonerod.txt b/contrib/rlwrap/monerocommands_bitmonerod.txt
new file mode 100644
index 000000000..1c97cfedf
--- /dev/null
+++ b/contrib/rlwrap/monerocommands_bitmonerod.txt
@@ -0,0 +1,34 @@
+ban
+bans
+diff
+exit
+flush_txpool
+hard_fork_info
+help
+hide_hr
+is_key_image_spent
+limit
+limit_down
+limit_up
+out_peers
+output_histogram
+print_bc
+print_block
+print_cn
+print_height
+print_pl
+print_pool
+print_pool_sh
+print_status
+print_tx
+q
+save
+set_log
+show_hr
+start_mining
+start_save_graph
+status
+stop_daemon
+stop_mining
+stop_save_graph
+unban
diff --git a/contrib/rlwrap/monerocommands_monero-wallet-cli.txt b/contrib/rlwrap/monerocommands_monero-wallet-cli.txt
new file mode 100644
index 000000000..c5e4c0323
--- /dev/null
+++ b/contrib/rlwrap/monerocommands_monero-wallet-cli.txt
@@ -0,0 +1,33 @@
+address
+balance
+bc_height
+check_tx_key
+export_key_images
+get_tx_key
+get_tx_note
+help
+import_key_images
+incoming_transfers
+integrated_address
+payments
+refresh
+rescan_bc
+rescan_spent
+save
+save_bc
+save_watch_only
+seed
+set
+set_tx_note
+show_transfers
+sign
+spendkey
+start_mining
+status
+stop_mining
+sweep_all
+sweep_unmixable
+transfer
+transfer_original
+verify
+viewkey